Merge branch 'dev' into multiframe-handling, with some merge bugfix

Browse Source

...

This commit is contained in:

Hombre57

2017-09-17 01:15:51 +02:00

parent ee0bff4124 10a4c5f1de

commit 0905294bda

197 changed files with 11535 additions and 5495 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

706

rtengine/rtthumbnail.cc

File diff suppressed because it is too large Load Diff