Merge branch 'master' into python

Conflicts: script/update
2013-06-21 23:04:39 +08:00 · 2013-06-21 23:04:39 +08:00 · 6bb3f1bba8
commit 6bb3f1bba8
parent 1eb521d32a f26db5c7a1
11 changed files with 392 additions and 2 deletions
--- a/script/update
+++ b/script/update
@ -5,7 +5,7 @@ set -e
 cd "$(dirname "$0")/.."

 ./script/update-frameworks.py
-./script/update-node.py --version v0.10.9
+./script/update-node.py --version v0.10.12

 gyp -f ninja --depth . atom.gyp \
  -Icommon.gypi \