Merge branch 'master' into gtk3-merge-master-b8eb349

2016-10-10 23:07:41 +02:00
parent d16d244fc5 b8eb3492c9
commit 0dbea030cb
166 changed files with 15898 additions and 2285 deletions
--- a/rtgui/shcselector.cc
+++ b/rtgui/shcselector.cc
@@ -21,7 +21,7 @@
 #include "multilangmgr.h"
 #include "mycurve.h"

-SHCSelector::SHCSelector() : ColoredBar(RTO_Left2Right), movingPosition(-1), cl(NULL)
+SHCSelector::SHCSelector() : ColoredBar(RTO_Left2Right), movingPosition(-1), tmpX(0.0), tmpPos(0.0), wslider(0.0), cl(NULL)
 {

    positions[0] = defaults[0] = 0.25;