Merge with 572a875474cb7c02682801dc30daab16a0d3c20b

2013-01-27 01:09:04 +01:00
parent f3e0647a32
commit ee33ca0b7d
25 changed files with 808 additions and 575 deletions
--- a/rtengine/dcrop.h
+++ b/rtengine/dcrop.h
@@ -55,6 +55,7 @@ class Crop : public DetailedCrop {

        bool cropAllocated;
        DetailedCropListener* cropImageListener;
+		
        Glib::Mutex cropMutex;
        ImProcCoordinator* parent;