Merge from default branch

2010-09-24 22:49:15 +02:00
parent 18d6799cbe
commit dc2350cee8
145 changed files with 23287 additions and 17316 deletions
--- a/rtgui/history.cc
+++ b/rtgui/history.cc
@@ -25,7 +25,7 @@ using namespace rtengine::procparams;
 Glib::ustring eventDescrArray[NUMOFEVENTS];
 extern Glib::ustring argv0;

-History::History (bool bookmarkSupport) : tpc (NULL), bmnum (1), blistener(NULL) {
+History::History (bool bookmarkSupport) : blistener(NULL), tpc (NULL), bmnum (1) {

    // fill history event message array
    for (int i=0; i<NUMOFEVENTS; i++)