Merge with ef386222219c7d420954431bdbcf252e8a487d1c

2014-02-19 14:09:22 +01:00
parent 8d70ca0f41
commit ee040bc8cd
94 changed files with 1433 additions and 218 deletions
--- a/rtgui/addsetids.h
+++ b/rtgui/addsetids.h
@@ -76,8 +76,9 @@
 #define ADDSET_BLACKWHITE_HUES          68
 #define ADDSET_BLACKWHITE_GAMMA         69
 #define ADDSET_DIRPYREQ_THRESHOLD       70
+#define ADDSET_DIRPYREQ_SKINPROTECT     71

 // When adding items, make sure to update ADDSET_PARAM_NUM
-#define ADDSET_PARAM_NUM                71 // THIS IS USED AS A DELIMITER!!
+#define ADDSET_PARAM_NUM                72 // THIS IS USED AS A DELIMITER!!

 #endif