Merging releases/1.6 into trunk. git-svn-id: https://google-web-toolkit.googlecode.com/svn/releases/1.6@4660 8db76d5a-ed1c-0410-87a9-c151d255dfc7
diff --git a/branch-info.txt b/branch-info.txt index 70f1a84..3ca517c 100644 --- a/branch-info.txt +++ b/branch-info.txt
@@ -28,6 +28,7 @@ /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) /trunk@c4603 was merged (r4605) into /releases/1.6 +/releases/1.6/@r4511:4604,4605:4657 was merged (r4659) into trunk, skipping c4605 (cherry picked above) The next merge into trunk will be: -svn merge -r4511:4605,4606:???? https://google-web-toolkit.googlecode.com/svn/releases/1.6 . +svn merge -r4657:???? https://google-web-toolkit.googlecode.com/svn/releases/1.6 .