Author: bugman Date: Tue Mar 16 02:13:12 2010 New Revision: 11010 URL: http://svn.gna.org/viewcvs/relax?rev=11010&view=rev Log: Temporary set up the svnmerge properties to merge the bieri_gui branch back into the 1.3 line. The command used was: svnmerge.py init svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/bieri_gui This will be used solely to test if this branch can be merged. Modified: 1.3/ (props changed) Propchange: 1.3/ ------------------------------------------------------------------------------ svnmerge-integrated = /branches/bieri_gui:1-9870