samuele3 cfb1cfdf65 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCCS ... Conflicts: cocos/editor-support/cocostudio/CCSGUIReader.h		2013-11-12 15:30:36 +08:00
..
auto-generated@ce2f223cd3	[AUTO] : updating submodule reference to latest autogenerated bindings	2013-11-11 10:57:57 +00:00
javascript	Adding cc.TextureCache.getInstance() to jsb_deprecated.js.	2013-11-11 16:45:44 +08:00
lua	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCCS	2013-11-12 15:30:36 +08:00
CMakeLists.txt	issue #2868:Add more ccs lua test samples	2013-11-12 15:25:47 +08:00