Desmis edd88be82c Try to solve conflit

2016-01-03 16:56:21 +01:00

..

dcpprofiles

Added Pentax K-5 II dual-illuminant DCP made using DCamProf 0.9.11

2015-09-25 19:49:33 +02:00

fonts

Issue 2134: removed obsolete raw highlight preservation setting from GUI (still left in procparams for backwards compatilibility)

2015-07-10 12:00:36 +02:00

iccprofiles

Issue 2134: removed obsolete raw highlight preservation setting from GUI (still left in procparams for backwards compatilibility)

2015-07-10 12:00:36 +02:00

icons

Issue 2134: removed obsolete raw highlight preservation setting from GUI (still left in procparams for backwards compatilibility)

2015-07-10 12:00:36 +02:00

images

update retinexadd with master 4d6833c

2016-01-03 15:48:22 +01:00

languages

Try to solve conflit

2016-01-03 16:56:21 +01:00

options

Issue 2134: removed obsolete raw highlight preservation setting from GUI (still left in procparams for backwards compatilibility)

2015-07-10 12:00:36 +02:00

osx

Fixes #3003 Detect pango-querymodules version from Homebrew on OS X

2015-12-19 22:50:38 +01:00

profiles

Issue 2134: removed obsolete raw highlight preservation setting from GUI (still left in procparams for backwards compatilibility)

2015-07-10 12:00:36 +02:00

sounds

Issue 2134: removed obsolete raw highlight preservation setting from GUI (still left in procparams for backwards compatilibility)

2015-07-10 12:00:36 +02:00

themes

Issue 2134: removed obsolete raw highlight preservation setting from GUI (still left in procparams for backwards compatilibility)

2015-07-10 12:00:36 +02:00

win

Fix CMake and AboutThisBuild with git (see issue #2860)

2015-08-14 19:06:01 +02:00

CMakeLists.txt

Missing changes for commit 0216c16a49 (issue #2871)

2015-08-18 16:32:57 +02:00