r20621 - /trunk/ -- August 16, 2013 - 20:19

Author: bugman
Date: Fri Aug 16 20:19:19 2013
New Revision: 20621

URL: http://svn.gna.org/viewcvs/relax?rev=20621&view=rev
Log:
Reverted r20620 as the checked out trunk copy was not up to date.

The command used was:
svn merge -r20620:r20619 .

.....
  r20620 | bugman | 2013-08-16 20:15:58 +0200 (Fri, 16 Aug 2013) | 3 lines
  Changed paths:
     M /trunk
  
  Initialized merge tracking via "svnmerge" with revisions "1-20577" from 
  svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/peak_intensities
.....


Modified:
    trunk/   (props changed)

Propchange: trunk/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated (removed)
@@ -1,1 +1,0 @@
-/branches/peak_intensities:1-20577