grossmj c1aad550fa Merge branch '1.5' into 2.0 ...

Conflicts:
	gns3server/version.py

2016-05-29 19:52:15 -06:00

..

asyncio

Cloud schema and remove use_ubridge for VMware VM.

2016-05-28 21:46:48 -06:00

__init__.py

Randomize the 4th and 5th bytes when provided with a base mac address. Fixes #522.

2016-05-27 23:00:05 -06:00

get_resource.py

Fix an error in frozen ressources loading

2015-07-03 20:29:49 +02:00

images.py

Apply pep8 fix

2015-11-09 12:28:00 +01:00

interfaces.py

Fixes check for NPF service and add check for NPCAP service on Windows.

2016-05-20 20:19:28 -06:00

path.py

Cleanup code for getting the default project directory

2016-05-11 18:42:55 +02:00

telnet_server.py

Refactoring to use a common node class for all VMs and other (future) objects.

2016-05-11 11:35:36 -06:00