boyu0 a48fee881d Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical		2013-09-16 22:16:50 +08:00
..
Cpp	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical	2013-09-16 22:16:50 +08:00
Javascript	upstream synchronize	2013-09-16 19:46:14 +08:00
Lua	Deprecated methods are replaced (warning MSVC C4996 is suppressed).	2013-09-16 15:38:03 +03:00
samples.xcodeproj	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical	2013-09-16 22:16:50 +08:00