Julien Duponchelle f8f6f5dc5d Merge branch 'master' into unstable ...

Conflicts:
	gns3server/modules/virtualbox/__init__.py
	gns3server/version.py

2015-04-29 14:25:44 +02:00

..

adapters

Some spring cleaning.

2015-04-08 11:17:34 -06:00

dynamips

Explicit utf-8 decoding.

2015-04-26 21:19:39 -06:00

iou

Do not erase the IOU config

2015-04-27 18:22:54 +02:00

nios

Some spring cleaning.

2015-04-08 11:17:34 -06:00

qemu

TAP interface support for QEMU VMs. Fixes #153.

2015-04-27 14:38:15 -06:00

virtualbox

Merge branch 'master' into unstable

2015-04-29 14:25:44 +02:00

vpcs

Avoid Cygwin warning with VPCS on Windows.

2015-04-27 22:23:27 -06:00

__init__.py

Skip IOU test on Windows

2015-04-27 15:09:42 +02:00

base_manager.py

Merge branch 'master' into unstable

2015-04-28 10:46:59 +02:00

base_vm.py

Some spring cleaning.

2015-04-08 11:17:34 -06:00

port_manager.py

Remove the workaround for dynamips OSX

2015-04-15 15:58:31 +02:00

project_manager.py

Alternative local server shutdown (mostly intended for Windows).

2015-03-13 18:57:27 -06:00

project.py

Fix some tests on Windows

2015-04-27 23:12:13 +02:00

vm_error.py

Modules support start iou process (not ioucon and iouyap)

2015-02-12 22:29:32 +01:00