Merge from trunk to version ed52f4f469 "Updated make-app-bundle script to use new template for file name"

This commit is contained in:
askvortsov
2010-10-01 10:36:31 -07:00
parent d6d6d6ae23
commit bcd42c3fc2
68 changed files with 2285 additions and 756 deletions

View File

@@ -54,6 +54,7 @@
#include <lensgeom.h>
#include <lensgeomlistener.h>
#include <equalizer.h>
#include <dirpyrequalizer.h>
class ImageEditorCoordinator;
@@ -92,6 +93,7 @@ class ToolPanelCoordinator : public ToolPanelListener,
Sharpening* sharpening;
LCurve* lcurve;
Equalizer * equalizer;
DirPyrEqualizer * dirpyrequalizer;
std::vector<PParamsChangeListener*> paramcListeners;