Merged master into gtk3, fixed three conflicts.
This commit is contained in:
@@ -107,16 +107,14 @@ protected:
|
||||
LUTf NoiseCCcurve;
|
||||
|
||||
LUTu vhist16, vhist16bw;
|
||||
LUTu lhist16, lhist16Cropped;
|
||||
LUTu lhist16CAM, lhist16CroppedCAM;
|
||||
LUTu lhist16CAM;
|
||||
LUTu lhist16CCAM;
|
||||
LUTu lhist16RETI;
|
||||
LUTu histCropped;
|
||||
LUTu lhist16Clad, lhist16CLlad, lhist16LClad, lhist16LLClad;
|
||||
LUTu lhist16CLlad, lhist16LClad;
|
||||
LUTu histRed, histRedRaw;
|
||||
LUTu histGreen, histGreenRaw;
|
||||
LUTu histBlue, histBlueRaw;
|
||||
LUTu histLuma, histToneCurve, histToneCurveBW, histLCurve, histCCurve, histCLurve;
|
||||
LUTu histLuma, histToneCurve, histToneCurveBW, histLCurve, histCCurve;
|
||||
LUTu histLLCurve, histLCAM, histCCAM, histClad, bcabhist, histChroma, histLRETI;
|
||||
|
||||
LUTf CAMBrightCurveJ, CAMBrightCurveQ;
|
||||
|
Reference in New Issue
Block a user