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

Posted to commits@myfaces.apache.org by lu...@apache.org on 2013/04/16 23:59:03 UTC

svn commit: r1468627 - in /myfaces/core: 2.2.x/ trunk/

Author: lu4242
Date: Tue Apr 16 21:59:02 2013
New Revision: 1468627

URL: http://svn.apache.org/r1468627
Log:
make 2.2.x trunk

Added:
    myfaces/core/trunk/   (props changed)
      - copied from r1468625, myfaces/core/2.2.x/
Removed:
    myfaces/core/2.2.x/

Propchange: myfaces/core/trunk/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Apr 16 21:59:02 2013
@@ -0,0 +1,13 @@
+*.iml
+*.ipr
+*.iws
+*.jdbc
+.classpath
+.externalToolBuilders
+.idea
+.project
+.settings
+derby.log
+maven-eclipse.xml
+myfacesOrchestraDB
+target

Propchange: myfaces/core/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Apr 16 21:59:02 2013
@@ -0,0 +1,5 @@
+/myfaces/core/branches/1.2.x:792657-823343,825575-833926,881094-925224,938283-940134
+/myfaces/core/branches/2.0.x:1098582-1124475
+/myfaces/core/branches/2.1.x-client-window:1396979-1406260,1410177-1410189,1410207-1420939,1420950-1421674,1433517
+/myfaces/core/trunk:1085607-1098581,1368943-1368953,1377776-1380084,1383166,1383168,1384981,1384983,1386916,1386944,1389919,1390212,1392355,1393567,1393891,1395401,1395406,1395409,1395974,1397444,1398700,1398769,1398929,1399817,1400150,1401352,1402825,1402849,1403894,1405217,1406527,1406532,1408903,1409426,1409468,1409476,1410155,1410171,1410540,1410553,1410652,1412781,1412831,1412932,1417719,1418586,1418589,1421641-1421655,1423194-1432818
+/myfaces/core/trunk_1.2.x:691297-695050,698037-743106,752296-779418,779422-792656