Author: aidan
Date: Thu Apr 17 04:25:14 2008
New Revision: 649055
URL: http://svn.apache.org/viewvc?rev=649055&view=rev
Log:
Track changes from M2.x now
Modified:
incubator/qpid/branches/thegreatmerge/ (props changed)
Propchange: incubator/qpid/branches/thegreatmerge/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Apr 17 04:25:14 2008
@@ -1 +1 @@
-/incubator/qpid/branches/M2.1:1-648207 /incubator/qpid/trunk:1-648216
+/incubator/qpid/branches/M2.1:1-648207 /incubator/qpid/branches/M2.x:1-648207
/incubator/qpid/trunk:1-648216
