Disable debugging symbols for all Emscripten builds. -g is simply too slow to be a useful debugging tool. If someone needs it they should add it back in, but it is not sensible default behavior at this point.
Merge pull request #2627 from samuele3hu/issue2103_testlua

add more test lua
Merge pull request #2631 from samuele3hu/issue2103_testlua

Add some skip function name to tools/tojs/cocos2dx_extension.ini
Merge pull request #2635 from samuele3hu/issue2103_testlua

modify some skip function name to tools/tojs/cocos2dx_extenson.ini
Update generate-jsbindings.sh [ci skip], send pull request to the branch which is being built.
Linux port: added libX11 to linked libraries.

Otherwise build fails on linux.
Implement CCEditBox for Tizen. (develop branch)
Merge pull request #2643 from pyrasis/tizen_2.1

Implement CCEditBox for Tizen.
Merge pull request #2641 from sergey-shambir/fix_linux_linkage

Linux port: added libX11 to linked libraries.
Merge branch 'develop'
issue #2161: android supports ETC format now
issue #2161: make linux,marmalade,native client,mac and emscripten project to include CCTextureETC.cpp
OnEnterTransitionDidFinish was called twice when a node is added in onEnter

Fix ported from cocos2d-iphone:
https://github.com/cocos2d/cocos2d-iphone/commit/99b7bef8800bd850f6b0c7dc1eb09d8e81fd80f7
issue #2161:add CCTextureETC.cpp/.h into vs2010 project
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into ETC1-support
issue #2161: resolve conflict
Merge pull request #2654 from minggo/ETC1-support

Support ETC1 format on Android
modify ORGANIZATIONNAME
Merge pull request #2659 from minggo/ETC1-support

modify ORGANIZATIONNAME
[AUTO] : updating submodule reference to latest autogenerated bindings