Author: thomas.diesler(a)jboss.com Date: 2007-08-09 07:06:13 -0400 (Thu, 09 Aug 2007) New Revision: 4285 Added: framework/branches/framework-2.0/mergeinfo.txt Log: Add mergeinfo Added: framework/branches/framework-2.0/mergeinfo.txt =================================================================== --- framework/branches/framework-2.0/mergeinfo.txt (rev 0) +++ framework/branches/framework-2.0/mergeinfo.txt 2007-08-09 11:06:13 UTC (rev 4285) @@ -0,0 +1,15 @@ +# +# This file records SVN merges to trunk that have already been done +# using this branch. Please use the following format +# +# +# username, dd-mmm-yyyy +# svn merge -r start:end svn url +# +# thomas.diesler(a)jboss.com 14-Jun-2007 +# svn merge -r3427:3430 https://svn.jboss.org/repos/jbossws/branches/jbossws-2.0 +# +# $Id: mergeinfo.txt 3833 2007-07-09 17:28:22Z heiko.braun(a)jboss.com $ + +thomas.diesler(a)jboss.com 09-Aug-2007 +svn merge -r4264:4274 https://svn.jboss.org/repos/jbossws/framework/branches/framework-2.0