grossmj 483431438a Merge remote-tracking branch 'origin/2.0' into 2.0 ...

Conflicts:
	gns3server/controller/project.py
	tests/compute/test_project.py
	tests/controller/test_project.py

2016-05-11 11:41:45 -06:00

..

asyncio

Merge branch '1.5' into 2.0

2016-05-10 17:51:40 +02:00

__init__.py

Improve parse_version

2016-05-06 17:09:03 +02: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

Check for NPF service on Windows.

2016-03-25 19:53:36 -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