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

Andi Clemens andi.clemens at gmx.net
Sat Nov 20 13:35:56 GMT 2010


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.

astyle: http://astyle.sourceforge.net/

Andi Clemens
-----------------
www.digikam.org

On Saturday 20 November 2010 14:16:46 Marcel Wiesweg wrote:
> > Gilles,
> > if all compiles fine under Windows and Mac,
> > I'd like to do the same for the
> > GSoC branch, so that changes from trunk are easier to apply to the
> > branch.
> 
> Does that mean the changes are automatic, so we can skip merging this patch
> and do it again in the branch? (hopeful not to have to manually fix too
> many conflicts ;-) )
> _______________________________________________
> Digikam-devel mailing list
> Digikam-devel at kde.org
> https://mail.kde.org/mailman/listinfo/digikam-devel



More information about the Digikam-devel mailing list