Author: dblevins
Date: Sat Mar 16 23:12:08 2013
New Revision: 1457337
URL: http://svn.apache.org/r1457337
Log:
restoring trunk as was before bad merge
Added:
tomee/tomee/trunk/ (props changed)
- copied from r1457336, tomee/tomee/trunk.bak/
Removed:
tomee/tomee/trunk.bak/
Propchange: tomee/tomee/trunk/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Mar 16 23:12:08 2013
@@ -0,0 +1,9 @@
+*.ipr
+*.iml
+*.iws
+*.log
+*~
+.classpath
+target
+.settings
+out
Propchange: tomee/tomee/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sat Mar 16 23:12:08 2013
@@ -0,0 +1,7 @@
+/openejb/branches/generated-descriptors:1239492,1239514,1239610,1239615
+/openejb/branches/openejb-3.1.1:779593
+/openejb/branches/openejb-3.1.x:945409,945448,1004381,1005322,1021880,1021903,1021955,1021961,1021965,1021975,1021979,1021990,1022375,1022393,1023096,1023116,1023125,1026527,1027696,1027724,1027739,1027754,1032856,1032866,1034030,1040222,1040250
+/openejb/branches/openejb-4.0.0:1326901
+/openejb/branches/openejb-4.0.0-beta-2:1227467
+/openejb/branches/openejb-jcdi:984659-985270
+/openejb/branches/openejb-pool:1364670-1368048
