Author: dkulp
Date: Wed Sep 28 17:25:39 2011
New Revision: 796315
Log:
Publishing merge to aries site by dkulp
Added:
websites/production/aries/content/schemas/
- copied from r796314, websites/staging/aries/trunk/content/schemas/
websites/production/aries/content/schemas/blueprint-cm/
- copied from r796314,
websites/staging/aries/trunk/content/schemas/blueprint-cm/
websites/production/aries/content/schemas/blueprint-cm/blueprint-cm-1.0.0.xsd
- copied unchanged from r796314,
websites/staging/aries/trunk/content/schemas/blueprint-cm/blueprint-cm-1.0.0.xsd
websites/production/aries/content/schemas/blueprint-cm/blueprint-cm-1.1.0.xsd
- copied unchanged from r796314,
websites/staging/aries/trunk/content/schemas/blueprint-cm/blueprint-cm-1.1.0.xsd
websites/production/aries/content/schemas/blueprint-ext/
- copied from r796314,
websites/staging/aries/trunk/content/schemas/blueprint-ext/
websites/production/aries/content/schemas/blueprint-ext/blueprint-ext-1.1.xsd
- copied unchanged from r796314,
websites/staging/aries/trunk/content/schemas/blueprint-ext/blueprint-ext-1.1.xsd
websites/production/aries/content/schemas/blueprint-ext/blueprint-ext.xsd
- copied unchanged from r796314,
websites/staging/aries/trunk/content/schemas/blueprint-ext/blueprint-ext.xsd
websites/production/aries/content/schemas/jpa/
- copied from r796314, websites/staging/aries/trunk/content/schemas/jpa/
websites/production/aries/content/schemas/jpa/jpa.xsd
- copied unchanged from r796314,
websites/staging/aries/trunk/content/schemas/jpa/jpa.xsd
websites/production/aries/content/schemas/jpa/jpa_110.xsd
- copied unchanged from r796314,
websites/staging/aries/trunk/content/schemas/jpa/jpa_110.xsd
websites/production/aries/content/schemas/transaction/
- copied from r796314,
websites/staging/aries/trunk/content/schemas/transaction/
websites/production/aries/content/schemas/transaction/transactionv10.xsd
- copied unchanged from r796314,
websites/staging/aries/trunk/content/schemas/transaction/transactionv10.xsd
websites/production/aries/content/schemas/transaction/transactionv11.xsd
- copied unchanged from r796314,
websites/staging/aries/trunk/content/schemas/transaction/transactionv11.xsd
Modified:
websites/production/aries/ (props changed)
Propchange: websites/production/aries/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 28 17:25:39 2011
@@ -1 +1 @@
-/websites/staging/aries/trunk:782169-796116
+/websites/staging/aries/trunk:782169-796314
