4 Commits

Author	SHA1	Message	Date
samuele3	80f3a7d57a	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developAssetsManager ... Conflicts: build/cocos2d_samples.xcodeproj/project.pbxproj cocos/scripting/lua/bindings/LuaScriptHandlerMgr.h cocos/scripting/lua/script/Cocos2dConstants.lua	2013-11-01 17:17:21 +08:00
samuelhu	c08a09a7e0	#3049:Add LICENSE_JSON4LUA and some constant values.	2013-10-30 10:52:04 +08:00
samuelhu	be1f17ca0f	issue #3037:Add assetsmananger lua binding and a releated test sample	2013-10-22 16:14:49 +08:00
minggo	4313c46e93	issue #2905:adjust folder structure	2013-10-12 11:22:05 +08:00