Author: apetrelli
Date: Mon Sep 14 07:17:14 2009
New Revision: 814503
URL: http://svn.apache.org/viewvc?rev=814503&view=rev
Log:
TILES-340
Merge from trunk to TILES_2_1_X branch.
More SVN properties.
Modified:
tiles/framework/branches/TILES_2_1_X/tiles-core/ (props changed)
tiles/framework/branches/TILES_2_1_X/tiles-test/ (props changed)
Propchange: tiles/framework/branches/TILES_2_1_X/tiles-core/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 14 07:17:14 2009
@@ -1 +1 @@
-/tiles/framework/trunk/tiles-core:749981,761052,761061,772781,784975,785782,788065-789653
+/tiles/framework/trunk/tiles-core:749981,761052,761061,772781,784975,785782,788065-789653,798944,814331
Propchange: tiles/framework/branches/TILES_2_1_X/tiles-test/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 14 07:17:14 2009
@@ -1 +1 @@
-/tiles/framework/trunk/tiles-test:747340,772781,785782,788065-789653
+/tiles/framework/trunk/tiles-test:747340,772781,785782,788065-789653,798944,814331
