[Digikam-devel] branches/extragear/graphics/digikam

[Gilles Caulier]

SVN commit 1182986 by cgilles:

sync with trunk rev. #1182982
Marcel, Andi, Aditya, Gabriel, Michael,
Please check my changes backported from trunk in imagepreviewview.cpp, digikamview.cpp, which introduce conflicts during sync.
CCMAIL: digikam-devel at kde.org


 M  +1 -0      CMakeLists.txt  
 M  +1 -1      HACKING  
 M  +2 -1      digikam/albumselectiontreeview.cpp  
 M  +86 -16    digikam/contextmenuhelper.cpp  
 M  +8 -8      digikam/contextmenuhelper.h  
 M  +2 -0      digikam/digikam.notifyrc  
 M  +19 -13    digikam/digikamapp.cpp  
 M  +2 -2      digikam/digikamapp_p.h  
 M  +3 -3      digikam/digikamimageview.cpp  
 M  +2 -2      digikam/digikamui.rc  
 M  +25 -29    digikam/digikamview.cpp  
 M  +1 -1      digikam/digikamview.h  
 M  +9 -0      digikam/dio.cpp  
 M  +6 -7      digikam/imagepreviewview.cpp  
 M  +1 -1      digikam/main.cpp  
 M  +2 -1      digikam/mediaplayerview.cpp  
 M  +3 -0      digikam/tagfolderview.cpp  
 M  +1 -0      imageplugins/color/CMakeLists.txt  
 M  +11 -0     imageplugins/color/profileconversiontool.cpp  
 M  +2 -2      libs/3rdparty/lensfun/README  
 M  +1 -1      libs/3rdparty/lensfun/include/regex/regex.h  
 M  +39 -12    libs/dimg/filters/lens/lensfuncameraselector.cpp  
 M  +2 -2      libs/dimg/filters/lens/lensfuniface.cpp  
 M  +8 -0      libs/dmetadata/dmetadata.cpp  
 M  +3 -0      libs/dmetadata/dmetadata.h  
 M  +2 -3      utilities/cameragui/cameraui.cpp  
 M  +2 -3      utilities/imageeditor/editor/editorwindow.cpp  
 M  +2 -3      utilities/lighttable/lighttablewindow.cpp  
 M  +3 -3      utilities/queuemanager/actionthread.cpp  
 M  +14 -6     utilities/queuemanager/basetools/color/iccconvert.cpp  
 M  +25 -4     utilities/queuemanager/queuemgrwindow.cpp  
 M  +2 -0      utilities/queuemanager/queuemgrwindow.h  


http://websvn.kde.org/?view=rev&revision=1182986