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 2012/10/15 18:39:01 UTC
svn commit: r1398379 - /myfaces/trinidad/branches/ar_backport_1940_to_1.2/
Author: arobinson74
Date: Mon Oct 15 16:39:01 2012
New Revision: 1398379
URL: http://svn.apache.org/viewvc?rev=1398379&view=rev
Log:
Create a branch to merge all the revisions needed for TRINIDAD-1940 into the 1.2 code line
Added:
myfaces/trinidad/branches/ar_backport_1940_to_1.2/ (props changed)
- copied from r1398374, myfaces/trinidad/branches/trinidad-1.2.x/
Propchange: myfaces/trinidad/branches/ar_backport_1940_to_1.2/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Oct 15 16:39:01 2012
@@ -0,0 +1,22 @@
+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
+relative mtr12 - clean all.app
+relative mtr12 - clean.app
+relative mtr12 - compare golden files.app
+relative mtr12 - install (test-skip).app
+relative mtr12 - install jdev-jdev.app
+relative mtr12 - install.app
+relative mtr12 - jdev-jdev.app
+relative mtr12 - jetty on demo and install.app
+relative mtr12 - jetty on demo.app
Propchange: myfaces/trinidad/branches/ar_backport_1940_to_1.2/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Oct 15 16:39:01 2012
@@ -0,0 +1,11 @@
+/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:888969
+/myfaces/trinidad/branches/1.2.9.1-branch:697924,699406,699496
+/myfaces/trinidad/branches/TRINIDAD-1402:745675
+/myfaces/trinidad/branches/anrobins_1.2.12.3_visitTree:964963-966042
+/myfaces/trinidad/branches/anrobins_1.2.12.3_visitTree_2:966043-984257
+/myfaces/trinidad/branches/anrobins_1.2.12.3_visitTree_3:984258-984269
+/myfaces/trinidad/branches/anrobins_1.2.12.3_visitTree_4:984270-988607
+/myfaces/trinidad/branches/jwaldman_StyleMap:754977-770778
+/myfaces/trinidad/trunk:930425,932153,1002826,1031716,1076418,1096803,1096816,1096825