r2943 - /1.2/r2943 - /1.2/Author: bugman Date: Sat Jan 6 05:51:21 2007 New Revision: 2943 URL: http://svn.gna.org/viewcvs/relax?rev=2943&view=rev Log: Reverted r2942, the incorrectly set up svnmerge props. The command used was: svn merge -r2942:2941 . Modified: 1.2/ (props changed) Propchange: 1.2/ ------------------------------------------------------------------------------ --- svnmerge-integrated (original) +++ svnmerge-integrated (removed) @@ -1,1 +1,0 @@ -/1.3:2505-2939