Merge from branch 3.0

2011-03-19 00:02:29 +01:00
parent 910bcc688c
commit f9d74687b9
20 changed files with 1873 additions and 1586 deletions
--- a/rtengine/improccoordinator.cc
+++ b/rtengine/improccoordinator.cc
@@ -109,7 +109,6 @@ void ImProcCoordinator::updatePreviewImage (int todo, Crop* cropCall) {

    mProcessing.lock ();

-
    ipf.setScale (scale);

    bool highDetailNeeded=false;