Author: [email protected]
Date: Mon May 11 07:59:52 2009
New Revision: 5331
Modified:
branches/snapshot-2009.04.28-r5307/branch-info.txt
Log:
updating branch-info.txt
Modified: branches/snapshot-2009.04.28-r5307/branch-info.txt
==============================================================================
--- branches/snapshot-2009.04.28-r5307/branch-info.txt (original)
+++ branches/snapshot-2009.04.28-r5307/branch-info.txt Mon May 11 07:59:52
2009
@@ -10,4 +10,7 @@
svn merge -r5313:5314
https://google-web-toolkit.googlecode.com/svn/trunk .
Merged in r5317 from trunk (r5318):
svn merge -r5316:5317
https://google-web-toolkit.googlecode.com/svn/trunk .
-
+Reverted r5296 and r5293 from trunk:
+ svn merge -r 5296:5295
https://google-web-toolkit.googlecode.com/svn/trunk .
+ svn merge -r 5293:5292
https://google-web-toolkit.googlecode.com/svn/trunk .
+ (had a minor conflict in CodeSplitter.java)
--~--~---------~--~----~------------~-------~--~----~
http://groups.google.com/group/Google-Web-Toolkit-Contributors
-~----------~----~----~----~------~----~------~--~---
