Updated branch-info.txt in releases/1.4 after merging into trunk.
git-svn-id: https://google-web-toolkit.googlecode.com/svn/releases/1.4@1402 8db76d5a-ed1c-0410-87a9-c151d255dfc7
diff --git a/branch-info.txt b/branch-info.txt
index 2f0a2e1..21c67db 100644
--- a/branch-info.txt
+++ b/branch-info.txt
@@ -1,5 +1,8 @@
/tags/1.4.59/ was created (r1341) as a straight copy from /trunk/@r1340
-/releases/1.4/ was created (r1384) as a straight copy from /tags/1.4.59/
+/releases/1.4/ was created (r1384) as a straight copy from /tags/1.4.59/@r1383
+/tags/1.4.60/ was created (r1400) as a straight copy from /releases/1.4/@r1399
+
+/releases/1.4/@r1384:r1400 was merged (r1401) into /trunk/
Changes in this branch:
- Release notes for post 1.4.59. (r1386)
@@ -9,3 +12,4 @@
- Removed html message from *.cache.html script frames. (r1390)
- GWTShellServlet's getResource() emulation now correctly finds resources on the servlet's module's public path. (r1391)
- Force HTTPRequestImpl to always send an empty string rather than a null. (r1393)
+- This file. :)
