Merge remote-tracking branch 'upstream/3.4' into merge-3.4

Browse Source

...

This commit is contained in:

Alexander Alekhin

2020-04-13 20:00:12 +00:00

parent f351653589 675342ecd9

commit ca9756f6a1

78 changed files with 192 additions and 53 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

samples/data/H1to3p.xml

Executable → Regular

samples/data/LinuxLogo.jpg

Executable → Regular

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

samples/data/WindowsLogo.jpg

Executable → Regular

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

samples/data/graf1.png

Executable → Regular

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

samples/data/graf3.png

Executable → Regular

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