1
0
mirror of https://github.com/GNS3/gns3-server synced 2024-12-04 22:28:12 +00:00
gns3-server/gns3server/modules
Jeremy 11ee72ddf3 Merge branch 'unstable' of github.com:GNS3/gns3-server into unstable
Conflicts:
	tests/modules/vpcs/test_vpcs_vm.py
2015-04-29 16:33:24 -06:00
..
adapters Some spring cleaning. 2015-04-08 11:17:34 -06:00
dynamips Merge branch 'unstable' of github.com:GNS3/gns3-server into unstable 2015-04-29 16:33:24 -06:00
iou Merge branch 'unstable' of github.com:GNS3/gns3-server into unstable 2015-04-29 16:33:24 -06:00
nios Some spring cleaning. 2015-04-08 11:17:34 -06:00
qemu Merge branch 'unstable' of github.com:GNS3/gns3-server into unstable 2015-04-29 16:33:24 -06:00
virtualbox Merge branch 'master' into unstable 2015-04-29 14:25:44 +02:00
vpcs Merge branch 'unstable' of github.com:GNS3/gns3-server into unstable 2015-04-29 16:33:24 -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 Merge branch 'unstable' into listen_notification 2015-04-29 16:07:19 -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 Merge branch 'unstable' of github.com:GNS3/gns3-server into unstable 2015-04-29 16:33:24 -06:00
vm_error.py