svn merge -c 37029 https://dart.googlecode.com/svn/branches/bleeding_edge trunk
svn merge -c 37030 https://dart.googlecode.com/svn/branches/bleeding_edge trunk
svn merge -c 37031 https://dart.googlecode.com/svn/branches/bleeding_edge trunk
svn merge -c 37035 https://dart.googlecode.com/svn/branches/bleeding_edge trunk
svn merge -c 37040 https://dart.googlecode.com/svn/branches/bleeding_edge trunk
svn merge -c 37043 https://dart.googlecode.com/svn/branches/bleeding_edge trunk
svn merge -c 37051 https://dart.googlecode.com/svn/branches/bleeding_edge trunk
git-svn-id: http://dart.googlecode.com/svn/trunk@37071 260f80e4-7a28-3924-810f-c04153c831b5
diff --git a/runtime/bin/eventhandler_win.cc b/runtime/bin/eventhandler_win.cc
index c16f1a5..4ab57c3 100644
--- a/runtime/bin/eventhandler_win.cc
+++ b/runtime/bin/eventhandler_win.cc
@@ -1000,6 +1000,7 @@
closesocket(socket());
MarkClosedRead();
MarkClosedWrite();
+ handle_ = INVALID_HANDLE_VALUE;
}
diff --git a/runtime/tools/create_resources.py b/runtime/tools/create_resources.py
index b4f7fa8..e5503be 100644
--- a/runtime/tools/create_resources.py
+++ b/runtime/tools/create_resources.py
@@ -40,7 +40,7 @@
if lineCounter != 0:
result += '\n '
result += ' 0\n};\n\n'
- resource_url_scrubbed = re.sub(r'\\', '', resource_url)
+ resource_url_scrubbed = re.sub(r'\\', '/', resource_url)
resources.append(
(resource_url_scrubbed, resource_name, os.stat(resource_file).st_size));
diff --git a/tools/VERSION b/tools/VERSION
index a86f573..bbd311b 100644
--- a/tools/VERSION
+++ b/tools/VERSION
@@ -28,4 +28,4 @@
MINOR 5
PATCH 0
PRERELEASE 4
-PRERELEASE_PATCH 1
+PRERELEASE_PATCH 2
