Rolando Abarca ac539667f4 Merge remote-tracking branch 'origin/gles20' into gles20 ... Conflicts: scripting/javascript/bindings/ScriptingCore.cpp scripting/javascript/bindings/js_bindings_chipmunk_manual.cpp		2012-11-16 09:44:34 -08:00
..
javascript	Merge remote-tracking branch 'origin/gles20' into gles20	2012-11-16 09:44:34 -08:00
lua	CCLuaEngine::executeAccelerometerEvent return 0 by default.	2012-11-12 10:37:42 +08:00