merge with dev - I hope no error

This commit is contained in:
Desmis
2017-02-21 18:02:48 +01:00
74 changed files with 886 additions and 695 deletions

View File

@@ -550,8 +550,9 @@ public:
int temperature;
double green;
double equal;
double tempBias;
WBEntry (const Glib::ustring &p, enum WBTypes t, const Glib::ustring &l, int temp, double green, double equal) : ppLabel (p), type (t), GUILabel (l), temperature (temp), green (green), equal (equal) {};
WBEntry(const Glib::ustring &p, enum WBTypes t, const Glib::ustring &l, int temp, double green, double equal, double bias) : ppLabel(p), type(t), GUILabel(l), temperature(temp), green(green), equal(equal), tempBias(bias) {};
};
class WBParams
@@ -563,6 +564,7 @@ public:
int temperature;
double green;
double equal;
double tempBias;
static void init();
static void cleanup();