Adam Reichold 8151e0f5ce Merge branch 'master' into 'gtk3' ...

Most conflicts seemed to be simple enough. There were a lot of `append_text` to
`append` conversions for `Gtk::ComboBoxText`. The `PopUpCommon` class also saw
a lot of changes with non-trivial conflict resolutions.

2016-01-06 23:56:12 +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

Merge branch 'master' into 'gtk3'

2016-01-06 23:56:12 +01:00

languages

Merge branch 'master' into 'gtk3'

2016-01-06 23:56:12 +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

Target the Filmstrip/File Browser frame directly with CSS, fixes #2983

2015-12-17 05:03:44 +01: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