Merge 2.1 into 2.2 branch.

Browse Source

...

This commit is contained in:

grossmj

2018-12-21 15:24:34 +08:00

parent 6d0afd39d7 cf73db25b4

commit fa9fc0ff8d

5 changed files with 28 additions and 18 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.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 34 KiB After Width:  |  Height:  |  Size: 40 KiB

BIN

resources/images/vmware_workstation_banner.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 35 KiB After Width:  |  Height:  |  Size: 38 KiB