Author: nbubna
Date: Tue Nov 30 19:13:57 2010
New Revision: 1040711
URL: http://svn.apache.org/viewvc?rev=1040711&view=rev
Log:
move 2.x branch to trunk
Added:
velocity/engine/trunk/ (props changed)
- copied from r1040710, velocity/engine/branches/2.0_Exp/
Removed:
velocity/engine/branches/2.0_Exp/
Propchange: velocity/engine/trunk/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Nov 30 19:13:57 2010
@@ -0,0 +1,11 @@
+bin
+target
+.project
+velocity.log*
+*.ser
+.classpath
+.settings
+.fbprefs
+.fbwarnings
+.codewrestler*
+.findbugs*
Propchange: velocity/engine/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Nov 30 19:13:57 2010
@@ -0,0 +1,2 @@
+/velocity/engine/branches/2.0_Exp:958513,991637-995742
+/velocity/engine/trunk:992133,1032159
