Merge branch 'master' into gtk3

2015-09-09 22:06:21 +02:00
parent f41424717d 18fb107f82
commit 7d9f743ce5
33 changed files with 1264 additions and 1262 deletions
--- a/rtdata/languages/default
+++ b/rtdata/languages/default
@@ -399,7 +399,7 @@ HISTORY_MSG_163;RGB Curves - Red
 HISTORY_MSG_164;RGB Curves - Green
 HISTORY_MSG_165;RGB Curves - Blue
 HISTORY_MSG_166;Exposure - Neutral
-HISTORY_MSG_167;--unused--
+HISTORY_MSG_167;Demosaicing method
 HISTORY_MSG_168;L*a*b* - CC curve
 HISTORY_MSG_169;L*a*b* - CH curve
 HISTORY_MSG_170;Vibrance - HH curve