Merge branch 'master' into python
Conflicts: script/update
This commit is contained in:
commit
6bb3f1bba8
11 changed files with 392 additions and 2 deletions
|
@ -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 \
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue