Author: bugman
Date: Thu Jan 20 20:55:28 2011
New Revision: 12389
URL: http://svn.gna.org/viewcvs/relax?rev=12389&view=rev
Log:
Reverted r12388 as the bieri_gui branch is still not ready for merging.
The command used was:
svn merge -r12388:12387 .
The branch is failing on the N_state_model.test_stereochem_analysis system
test for some bizarre
reason!
.....
r12388 | bugman | 2011-01-20 20:51:15 +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
r12389 - /1.3/