Merge branch 'master' into gtk3

This commit is contained in:
Beep6581
2016-03-13 20:04:57 +01:00
14 changed files with 42 additions and 23 deletions

View File

@@ -91,7 +91,7 @@ public:
void updateBackgroundHistogram (LUTu & hist);
void pipetteMouseOver (CurveEditor *ce, EditDataProvider *provider, int modifierKey);
void pipetteButton1Pressed(EditDataProvider *provider, int modifierKey);
bool pipetteButton1Pressed(EditDataProvider *provider, int modifierKey);
void pipetteButton1Released(EditDataProvider *provider);
void pipetteDrag(EditDataProvider *provider, int modifierKey);