r20622 - /branches/peak_intensities/ -- August 16, 2013 - 20:19

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

URL: http://svn.gna.org/viewcvs/relax?rev=20622&view=rev
Log:
Merged revisions 20620-20621 via svnmerge from 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk

........
  r20620 | bugman | 2013-08-16 20:15:58 +0200 (Fri, 16 Aug 2013) | 3 lines
  
  Initialized merge tracking via "svnmerge" with revisions "1-20577" from 
  svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/peak_intensities
........
  r20621 | bugman | 2013-08-16 20:19:19 +0200 (Fri, 16 Aug 2013) | 15 lines
  
  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:
    branches/peak_intensities/   (props changed)

Propchange: branches/peak_intensities/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Aug 16 20:19:45 2013
@@ -1,1 +1,1 @@
-/trunk:1-20596
+/trunk:1-20621