[Digikam-devel] Re: extragear/graphics/digikam

[Gilles Caulier]

can you merge trunk to  branch yourself just after 1.6.0 planed monday morning ?
gilles

2010/11/20, Marcel Wiesweg <marcel.wiesweg at gmx.de>:
>
>> Yes, it is automatic, so we can simply run it on the branch.
>> We could also wait until we apply the patch, after GSoC has been merged
>> with trunk.
>>
>> I use astyle for formatting, I will add it to the HACKING file.
>
> Then I would ask Gilles to omit the big patch from merging, I have quite
> extensive local changes in branch.
> No problem to run it on the branch later, to make further merging the
> easier.
>
> Marcel
> _______________________________________________
> Digikam-devel mailing list
> Digikam-devel at kde.org
> https://mail.kde.org/mailman/listinfo/digikam-devel
>