grossmj a5d89b428a Merge branch '2.2' into 3.0 ... # Conflicts: # gns3server/controller/__init__.py # gns3server/controller/compute.py # gns3server/schemas/gns3vm.py # gns3server/utils/application_id.py # gns3server/version.py # gns3server/web/web_server.py		2020-11-05 17:15:25 +10:30
..
__init__.py	Merge branch '2.2' into 3.0	2020-11-05 17:15:25 +10:30
base_gns3_vm.py	Option to allocate or not the vCPUs and RAM settings for the GNS3 VM. Fixes https://github.com/GNS3/gns3-gui/issues/3069	2020-11-05 11:13:57 +10:30
gns3_vm_error.py	Manage error when GNS3VM failed to start	2016-09-01 15:36:41 +02:00
hyperv_gns3_vm.py	Option to allocate or not the vCPUs and RAM settings for the GNS3 VM. Fixes https://github.com/GNS3/gns3-gui/issues/3069	2020-11-05 11:13:57 +10:30
remote_gns3_vm.py	Option to allocate or not the vCPUs and RAM settings for the GNS3 VM. Fixes https://github.com/GNS3/gns3-gui/issues/3069	2020-11-05 11:13:57 +10:30
virtualbox_gns3_vm.py	Merge branch '2.2' into 3.0	2020-11-05 17:15:25 +10:30
vmware_gns3_vm.py	Option to allocate or not the vCPUs and RAM settings for the GNS3 VM. Fixes https://github.com/GNS3/gns3-gui/issues/3069	2020-11-05 11:13:57 +10:30