Author: bugman Date: Thu Jan 20 20:48:13 2011 New Revision: 12387 URL: http://svn.gna.org/viewcvs/relax?rev=12387&view=rev Log: Reverted r12385 as the bieri_gui branch was not quite ready for merging. The command used was: svn merge -r12385:12384 . ..... r12385 | bugman | 2011-01-20 19:29:47 +0100 (Thu, 20 Jan 2011) | 3 lines Changed paths: M /1.3 Initialized merge tracking via "svnmerge" with revisions "1-9870" from svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/bieri_gui ..... Modified: 1.3/ (props changed) Propchange: 1.3/ ------------------------------------------------------------------------------ --- svnmerge-integrated (original) +++ svnmerge-integrated (removed) @@ -1,1 +1,0 @@ -/branches/bieri_gui:1-9870