On Monday 31 December 2012 15:45:32 Christophe Giboudeaux wrote: > Hi, > > On Monday 31 December 2012 11:54:22 David Faure wrote: > > Hi Christophe, > > > > This creates a nice set of conflicts in frameworks. > > [...] > > > Can you do "git merge origin/master" in a frameworks checkout and fix the > > conflicts? > > Done, please double check if all still builds
Done, thank you very much. -- David Faure, [email protected], http://www.davidfaure.fr Working on KDE, in particular KDE Frameworks 5
signature.asc
Description: This is a digitally signed message part.
_______________________________________________ Kde-buildsystem mailing list [email protected] https://mail.kde.org/mailman/listinfo/kde-buildsystem
