merge with dev...

This commit is contained in:
Desmis
2017-06-19 12:30:20 +02:00
90 changed files with 598 additions and 866 deletions

View File

@@ -26,7 +26,7 @@ using namespace rtengine::procparams;
Glib::ustring eventDescrArray[NUMOFEVENTS];
History::History (bool bookmarkSupport) : blistener (nullptr), tpc (nullptr), bmnum (1)
History::History (bool bookmarkSupport) : historyVPaned(nullptr), blistener(nullptr), tpc (nullptr), bmnum (1)
{
blistenerLock = false; // sets default that the Before preview will not be locked