Bookkeeping of 3 cherrypick merges and one reverse merge. If need be, I
volunteer to sort out the next one since there's now at least 4
fragments...
git-svn-id: https://google-web-toolkit.googlecode.com/svn/releases/1.6@4322 8db76d5a-ed1c-0410-87a9-c151d255dfc7
diff --git a/branch-info.txt b/branch-info.txt
index 7f0f3d0..3214f55 100644
--- a/branch-info.txt
+++ b/branch-info.txt
@@ -16,7 +16,13 @@
/releases/1.6/@r4025:4130 was merged (r4142) into trunk, superceding trunk:c4118
/releases/1.6/@r4130:4147 was merged (r4148) into trunk
/releases/1.6/@r4147:4198 was merged (r4202) into trunk
+/releases/1.6/@c4269, c4298, and c4299 were merged (r4314) into trunk; note this is a cherrypick
+/trunk revision c4266 was merged (r4321) into this branch
----> The next merge into trunk will be 4198:????
+---> The next merge into trunk will be 4198:4268, 4269:4297, 4299:4320, and 4321:????
-svn merge --accept postpone -4198:???? https://google-web-toolkit.googlecode.com/svn/releases/1.6 .
+svn merge --accept postpone -r4198:4268 https://google-web-toolkit.googlecode.com/svn/releases/1.6 .
+svn merge --accept postpone -r4269:4297 https://google-web-toolkit.googlecode.com/svn/releases/1.6 .
+svn merge --accept postpone -r4299:4320 https://google-web-toolkit.googlecode.com/svn/releases/1.6 .
+svn merge --accept postpone -r4321:???? https://google-web-toolkit.googlecode.com/svn/releases/1.6 .
+
