Merged master into gtk3 with some manually fixed merge conflicts caused by formatting changes.

Browse Source

...

This commit is contained in:

Beep6581

2016-04-30 16:29:13 +02:00

parent 59a9d2dc2f c8db56643a

commit a47043d6cd

8 changed files with 50 additions and 7 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

rtdata/dcpprofiles/Sony ILCE-6000.dcp

Binary file not shown.

BIN

rtdata/iccprofiles/output/Rec2020.icm Normal file

Binary file not shown.