Author: rj...@google.com
Date: Thu Jan 22 08:34:50 2009
New Revision: 4513
Modified:
releases/1.6/branch-info.txt
Log:
Updates 1.6 branch-info.txt to reflect today's merge (490:4497,4498:4511).
Note that --accept=postpone has been dropped. svn says there is no such
thing.
LGTM from jgw via chat
Modified: releases/1.6/branch-info.txt
==============================================================================
--- releases/1.6/branch-info.txt (original)
+++ releases/1.6/branch-info.txt Thu Jan 22 08:34:50 2009
@@ -26,6 +26,7 @@
/releases/1.6/@r4385:4459 was merged (r4488) into trunk
/releases/1.6/@r4359:4490 was merged (r4491) into trunk
/releases/1.6/@c4498 was merged (r4499) into trunk
+/releases/1.6/@r4490:4497,4498:4511 was merged (r4512) into trunk,
skipping c4498 (cherry picked above)
The next merge into trunk will be:
-svn merge --accept=postpone -r4490:4498,4499:????
https://google-web-toolkit.googlecode.com/svn/releases/1.6 .
+svn merge -r4511:????
https://google-web-toolkit.googlecode.com/svn/releases/1.6 .
--~--~---------~--~----~------------~-------~--~----~
http://groups.google.com/group/Google-Web-Toolkit-Contributors
-~----------~----~----~----~------~----~------~--~---
