Author: chirino
Date: Fri Jun 20 10:07:11 2008
New Revision: 669992
URL: http://svn.apache.org/viewvc?rev=669992&view=rev
Log:
Fixing up svnmerge props
Modified:
servicemix/components/shared-libraries/trunk/ (props changed)
servicemix/components/shared-libraries/trunk/servicemix-common/ (props
changed)
servicemix/components/shared-libraries/trunk/servicemix-shared/ (props
changed)
servicemix/components/shared-libraries/trunk/servicemix-soap/ (props
changed)
servicemix/components/shared-libraries/trunk/servicemix-soap2/ (props
changed)
Propchange: servicemix/components/shared-libraries/trunk/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Jun 20 10:07:11 2008
@@ -1 +1 @@
-/servicemix/smx3/trunk/deployables/sharedlibraries:1-669160
+/servicemix/smx3/trunk/common:1-669159
Propchange: servicemix/components/shared-libraries/trunk/servicemix-common/
('svnmerge-integrated' removed)
Propchange: servicemix/components/shared-libraries/trunk/servicemix-shared/
------------------------------------------------------------------------------
--- svnmerge-integrated (added)
+++ svnmerge-integrated Fri Jun 20 10:07:11 2008
@@ -0,0 +1 @@
+/servicemix/smx3/trunk/deployables/sharedlibraries/servicemix-shared:1-669160
Propchange: servicemix/components/shared-libraries/trunk/servicemix-soap/
('svnmerge-integrated' removed)
Propchange: servicemix/components/shared-libraries/trunk/servicemix-soap2/
('svnmerge-integrated' removed)
