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

[Gilles Caulier]

strange. it compile there. sound like files are missing (not added) ?

Gilles

2010/8/15 Andi Clemens <andi.clemens at gmx.net>:
> Gilles,
>
> you don't seem to have merged correctly with trunk. Some files are missing and
> the GSOC branch will not compile.
>
> For example in adavancedrename the AdvancedRenameManager is not synced.
>
> Andi
>
>
> On Sunday 15 August 2010 12:06:56 Gilles Caulier wrote:
>> SVN commit 1163894 by cgilles:
>>
>> sync with trunk rev. #1163886
>>
>>
>>  M  +5 -3      CMakeLists.txt
>>  M  +2 -2      digikam/daboutdata.h
>>  M  +17 -0     digikam/digikam.notifyrc
>>  M  +37 -33    libs/dimg/filters/bw/bwsepiasettings.cpp
>>  M  +9 -0      showfoto/showfoto.cpp
>>  M  +1 -0      showfoto/showfoto.desktop
>>  M  +120 -222  tests/advancedrenametest.cpp
>>  M  +2 -8      tests/advancedrenametest.h
>>  M  +22 -11    utilities/advancedrename/advancedrenamedialog.cpp
>>  M  +0 -13     utilities/advancedrename/advancedrenamewidget.cpp
>>  M  +0 -5      utilities/advancedrename/advancedrenamewidget.h
>>  M  +11 -16    utilities/advancedrename/common/parser.cpp
>>  M  +1 -1      utilities/advancedrename/common/parser.h
>>  M  +3 -8      utilities/advancedrename/common/parsesettings.h
>>  M  +37 -1     utilities/advancedrename/parser/options/cameranameoption.cpp
>>  M  +2 -4      utilities/advancedrename/parser/options/dateoption.cpp
>>  M  +39 -9
>> utilities/advancedrename/parser/options/sequencenumberoption.cpp M  +7 -0
>>
>> utilities/advancedrename/parser/options/sequencenumberoptiondialogwidget.u
>> i M  +33 -12    utilities/cameragui/cameraiconview.cpp
>>  M  +38 -19    utilities/cameragui/renamecustomizer.cpp
>>  M  +3 -0      utilities/cameragui/renamecustomizer.h
>>  U             utilities/imageeditor/editor/editorwindow.h
>>  M  +10 -1     utilities/imageeditor/editor/imagewindow.cpp
>>  M  +1 -1      utilities/imageeditor/editor/imagewindow.h
>>  M  +2 -1      utilities/imageeditor/widgets/previewlist.cpp
>>  M  +2 -0      utilities/queuemanager/basetools/color/bwconvert.cpp
>>  M  +13 -1     utilities/queuemanager/batchtool.h
>>  M  +44 -12    utilities/queuemanager/queuelist.cpp
>>  M  +7 -0      utilities/queuemanager/queuesettingsview.cpp
>>
>>
>> http://websvn.kde.org/?view=rev&revision=1163894
> _______________________________________________
> Digikam-devel mailing list
> Digikam-devel at kde.org
> https://mail.kde.org/mailman/listinfo/digikam-devel
>