Jeremy 929c337e8b Merge branch 'unstable' ... Conflicts: gns3server/modules/virtualbox/__init__.py gns3server/version.py tests/modules/test_manager.py		2015-04-29 16:29:45 -06:00
..
__init__.py	New base server.	2015-01-13 17:05:26 -07:00
dynamips_device.py	Restore device IDs and fixes race condition when converting an old project.	2015-03-01 13:05:51 -07:00
dynamips_vm.py	Merge branch 'unstable'	2015-04-29 16:29:45 -06:00
file.py	Support wireshark remote capture	2015-04-20 19:27:07 +02:00
iou.py	Merge branch 'unstable'	2015-04-29 16:29:45 -06:00
nio.py	Return an explicit error when a NIO type is not supported by a VM.	2015-04-27 14:19:17 -06:00
project.py	Fixes tests.	2015-03-14 13:16:27 -06:00
qemu.py	Merge branch 'unstable'	2015-04-29 16:29:45 -06:00
version.py	Adds info either the server is started as a local server in VersionHandler response.	2015-03-13 15:15:27 -06:00
virtualbox.py	Return an explicit error when a NIO type is not supported by a VM.	2015-04-27 14:19:17 -06:00
vpcs.py	Return an explicit error when a NIO type is not supported by a VM.	2015-04-27 14:19:17 -06:00