grossmj 33e8710495 Merge branch '2.1' into 2.2 ... # Conflicts: # gns3server/compute/docker/docker_vm.py # gns3server/controller/compute.py # gns3server/controller/gns3vm/__init__.py # gns3server/controller/link.py # gns3server/controller/project.py # gns3server/handlers/api/controller/project_handler.py # gns3server/handlers/api/controller/server_handler.py # gns3server/utils/asyncio/__init__.py # gns3server/utils/asyncio/telnet_server.py # gns3server/version.py # gns3server/web/web_server.py # tests/compute/qemu/test_qemu_vm.py		2018-08-29 15:57:54 +07:00
..
asyncio	Merge branch '2.1' into 2.2	2018-08-29 15:57:54 +07:00
__init__.py	Returns the ports' adapter types and mac addresses when available.	2018-04-06 13:19:17 +07:00
file_watcher.py	Optimize appliance templates update from GitHub repository by only downloading when the repository	2018-08-21 16:26:07 +07:00
get_resource.py	Fix an error in frozen ressources loading	2015-07-03 20:29:49 +02:00
images.py	Merge branch '2.1' into 2.2	2018-06-10 21:19:55 +07:00
interfaces.py	Check if the HAXM service is running when starting a Qemu VM with hardware acceleration. Ref #1242.	2018-03-24 22:15:20 +07:00
path.py	Cleanup code for getting the default project directory	2016-05-11 18:42:55 +02:00
picture.py	Fix issue with some SVG symbols that could not be used in GNS3.	2018-06-06 16:32:51 +07:00
ping_stats.py	Merge 2.1 into 2.2 branch	2018-03-12 13:38:50 +07:00
qt.py	Fix an error when importing old topology without color for label	2016-10-24 14:58:14 +02:00
static.py	Serve WebUI handlers and update-bundled-web-ui script, Ref: #1362	2018-06-26 12:09:08 +02:00
vmnet.py	Change order to find vnetlib on Windows (PATH -> Registry -> Default directories).	2018-06-04 21:57:34 +07:00
windows_loopback.py	Tool to add, configure and remove Windows loopback adapters.	2016-11-05 15:10:05 +11:00
windows_service.py	Check if the HAXM service is running when starting a Qemu VM with hardware acceleration. Ref #1242.	2018-03-24 22:15:20 +07:00