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

Conflicts:
	gns3server/version.py

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

..

__init__.py

Merge branch '1.5' into 2.0

2016-05-17 09:39:36 +02:00

nio_vmnet.py

Rename hypervisor to compute

2016-04-15 17:59:59 +02:00

vmware_error.py

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

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

vmware_vm.py

Merge branch '1.5' into 2.0

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