> Author: vhennebert > Date: Fri Jul 25 03:55:49 2008 > New Revision: 679758 > > URL: http://svn.apache.org/viewvc?rev=679758&view=rev > Log: > Merged revisions 679052-679352 via svnmerge from > https://svn.eu.apache.org/repos/asf/xmlgraphics/fop/trunk > > ........ > r679326 | vhennebert | 2008-07-24 10:35:34 +0100 (Thu, 24 Jul 2008) | 2 > lines > > Fed up with all those trailing whitespaces. Let's remove them all (once... > and for all?) > ........
I wasn’t expecting merging conflicts in the branches, yet it appears that I got a few of them. I had to sort out my own mess. Thing is, I can’t readily do the same in the IF branch since I don’t have svn 1.5 installed on my machine. Jeremias, let me know if you have any trouble while merging. Vincent
