From: Cheng Zhao <zcbenz@gmail.com>
Date: Fri, 21 Jun 2013 15:04:39 +0000 (+0800)
Subject: Merge branch 'master' into python
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6bb3f1bba8a3ae60bbd2c2703571c6dee9e04c60;p=platform%2Fframework%2Fweb%2Fcrosswalk-tizen.git

Merge branch 'master' into python

Conflicts:
	script/update
---

6bb3f1bba8a3ae60bbd2c2703571c6dee9e04c60
diff --cc script/update
index 89ddc06,4688600..23f306e
--- a/script/update
+++ b/script/update
@@@ -4,11 -4,10 +4,11 @@@ set -
  
  cd "$(dirname "$0")/.."
  
 -./script/update-frameworks
 -./script/update-node v0.10.12
 +./script/update-frameworks.py
- ./script/update-node.py --version v0.10.9
++./script/update-node.py --version v0.10.12
  
 -gyp --depth . atom.gyp \
 +gyp -f ninja --depth . atom.gyp \
 +  -Icommon.gypi \
    -Ivendor/brightray/brightray.gypi \
    -Dtarget_arch=ia32 \
    -Dlibrary=static_library