samuele3hu 6ae80bcaf0 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2433-lua-bindings-generator		2013-08-23 16:14:19 +08:00
..
Cpp	Merge pull request #3465 from dumganhar/develop	2013-08-22 20:28:57 -07:00
Javascript	Adding a new search path 'res' to TestJavascript since some resources are defined as hard code in ControlColourPicker::init().	2013-08-23 15:55:25 +08:00
Lua	issue #2433:Add lua deprecated fiel and modify some test samples	2013-08-23 16:12:59 +08:00
samples.xcodeproj	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2433-lua-bindings-generator	2013-08-16 10:13:38 +08:00