Merged master into gtk3, fixed three conflicts.

Browse Source

...

This commit is contained in:

Beep6581

2016-06-09 22:36:59 +02:00

parent 7040b6e5b1

commit c857bba95e

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

2990

rtengine/dcp.cc

File diff suppressed because it is too large Load Diff