Intermediate merge of the pipette branch

2014-03-15 23:50:36 +01:00
parent 3413959776 9484aa0ebe
commit 6263f391eb
47 changed files with 1666 additions and 1114 deletions
--- a/rtgui/toolpanelcoord.h
+++ b/rtgui/toolpanelcoord.h
@@ -108,7 +108,7 @@ class ToolPanelCoordinator :    public ToolPanelListener,
        Defringe* defringe;
        ImpulseDenoise* impulsedenoise;
        DirPyrDenoise* dirpyrdenoise;
-        EdgePreservingDecompositionUI *edgePreservingDecompositionUI;
+        EdgePreservingDecompositionUI *epd;
        Sharpening* sharpening;
        SharpenEdge* sharpenEdge;
        SharpenMicro* sharpenMicro;