Author: jcompagner
Date: Tue Dec 20 08:22:09 2011
New Revision: 1221136
URL: http://svn.apache.org/viewvc?rev=1221136&view=rev
Log:
just some merge properties on the project
igor already did my port (was very busy yesterday afternoon)
Modified:
wicket/branches/wicket-1.5.x/wicket-core/ (props changed)
Propchange: wicket/branches/wicket-1.5.x/wicket-core/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 20 08:22:09 2011
@@ -1,5 +1,5 @@
/wicket/branches/wicket-1.3.x/jdk-1.4/wicket:653208,653212,653215,653226,653231,654304,655446,655466,655786,658141,658189,659118,659120,662360,663058,671549,671885,687144-688996,698530-698577,701132-701133,701843,701850-701877,704231,708127,722099-722105,726536,728467-728490,731960,734478,739647,739951,745468-745497,749817,755171-755176,759905,760374,764756,769389,769440,774373,781715,781719,790879
-/wicket/branches/wicket-1.4.x/wicket:963681,998663,1005194-1005196,1005201,1005205,1024347,1027877,1210482
+/wicket/branches/wicket-1.4.x/wicket:963681,998663,1005194-1005196,1005201,1005205,1024347,1027877,1210482,1220820
/wicket/sandbox/jthomerson/experimental/wicket-devutils/wicket:760296-760351,760353-760355
/wicket/trunk/wicket:1005201
/wicket/trunk/wicket-core:1204836,1204865,1211037
