Hi Ales and all, On Tuesday 12 December 2006 04:36, Ales Hvezda wrote: > >The general rule in gcc-land is to create one ChangeLog entry for > > your merge, which contains the ChangeLog entries you are merging. > > Like this: > > Looks reasonable to me. Let us know how the merge went. I > expect your merge will be easier than the glist_dev merge.
Merged without serious problems. Only four simple conflicts in: gschem/Changelog (as mentioned earlier) gschem/bitmaps/Makefile.am (1 line) gschem/src/x_dialog.c (5 lines) gschem/include/prototypes.h (the cvs ID line) I've accidently updated the po and pot files in gschem/po/, but I don't think it's a problem, only some additional traffic in the cvs mailing list. Regards Werner _______________________________________________ geda-dev mailing list [email protected] http://www.seul.org/cgi-bin/mailman/listinfo/geda-dev
