You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@myfaces.apache.org by ma...@apache.org on 2010/03/12 17:02:23 UTC

svn commit: r922305 - in /myfaces/trinidad: branches/trinidad-2.0.0.3/ trinidad-2.0.0.3/

Author: matzew
Date: Fri Mar 12 16:02:23 2010
New Revision: 922305

URL: http://svn.apache.org/viewvc?rev=922305&view=rev
Log:
moving the trunk merged' repo to the "root" folder

Added:
    myfaces/trinidad/trinidad-2.0.0.3/   (props changed)
      - copied from r922304, myfaces/trinidad/branches/trinidad-2.0.0.3/
Removed:
    myfaces/trinidad/branches/trinidad-2.0.0.3/

Propchange: myfaces/trinidad/trinidad-2.0.0.3/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Mar 12 16:02:23 2010
@@ -0,0 +1,13 @@
+target
+*.ipr
+*.iws
+*.iml
+trinidad.jws
+cwallet.sso
+jps-config.xml
+trinidad-data-sources.xml
+trinidad-oc4j-app.log
+trinidad-oc4j-app.log.0
+trinidad-oc4j-app.log.0.lck
+trinidad-oc4j-app.xml
+.adf

Propchange: myfaces/trinidad/trinidad-2.0.0.3/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Mar 12 16:02:23 2010
@@ -0,0 +1,9 @@
+/myfaces/trinidad/branches/1.2.11.3-branch:770843-770856,771372,785365
+/myfaces/trinidad/branches/1.2.11.4-branch:794062,794792,798299
+/myfaces/trinidad/branches/1.2.9.1-branch:697924,699406,699496
+/myfaces/trinidad/branches/TRINIDAD-1402:745675
+/myfaces/trinidad/branches/ar-1715:908782
+/myfaces/trinidad/branches/ar_clientBehaviors:881469-891464
+/myfaces/trinidad/branches/jwaldman_StyleMap:754977-770778
+/myfaces/trinidad/branches/trinidad-2.0.x:823098-895949
+/myfaces/trinidad/trunk:819601,819622,834147,886881,888973,893043,896231-908455,908699-921461