Merge branch '2.1' into 2.2

Browse Source

# Conflicts:
#	gns3/ui/main_window_ui.py
#	gns3/ui/resources_rc.py
#	gns3/version.py
#	resources/resources.qrc

...

This commit is contained in:

grossmj

2018-01-23 12:44:02 +07:00

parent a5435280d7 1482b0e804

commit e1d2bcca20

24 changed files with 163 additions and 80 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

resources/images/vmware_fusion_banner.jpg

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 31 KiB

BIN

resources/images/vmware_fusion_banner.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 34 KiB

BIN

resources/images/vmware_workstation_banner.jpg

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 32 KiB

BIN

resources/images/vmware_workstation_banner.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 35 KiB