You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ar...@apache.org on 2011/04/28 01:08:55 UTC
svn commit: r1097273 -
/myfaces/trinidad/branches/1.2.12.5.0-r1086356-2047-branch/
Author: arobinson74
Date: Wed Apr 27 23:08:55 2011
New Revision: 1097273
URL: http://svn.apache.org/viewvc?rev=1097273&view=rev
Log:
Need a branch to store the fix for Trinidad 2047 off of SVN revision 1086356 on the 1.2.12.5.0 branch
Added:
myfaces/trinidad/branches/1.2.12.5.0-r1086356-2047-branch/ (props changed)
- copied from r1086356, myfaces/trinidad/branches/1.2.12.5.0-branch/
Propchange: myfaces/trinidad/branches/1.2.12.5.0-r1086356-2047-branch/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Apr 27 23:08:55 2011
@@ -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/branches/1.2.12.5.0-r1086356-2047-branch/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Apr 27 23:08:55 2011
@@ -0,0 +1,7 @@
+/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.12.2-branch:895708
+/myfaces/trinidad/branches/1.2.9.1-branch:697924,699406,699496
+/myfaces/trinidad/branches/TRINIDAD-1402:745675
+/myfaces/trinidad/branches/jwaldman_StyleMap:754977-770778
+/myfaces/trinidad/trunk:894885,915962,962582,1002826,1031716,1076418