samuele3hu eed0297c59 Merge branch 'deprecatedfunc' of https://github.com/samuele3hu/cocos2d-x; branch 'develop' of https://github.com/cocos2d/cocos2d-x into deprecatedfunc		2013-07-22 09:39:57 +08:00
..
Cpp	Merge pull request #3197 from dumganhar/ricardoquesada-more_more_best_practices_fixes	2013-07-19 08:15:39 -07:00
Javascript	More best practices fixes	2013-07-18 16:30:19 -07:00
Lua	Merge branch 'deprecatedfunc' of https://github.com/samuele3hu/cocos2d-x; branch 'develop' of https://github.com/cocos2d/cocos2d-x into deprecatedfunc	2013-07-22 09:39:57 +08:00
samples.xcodeproj	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into deprecatedfunc	2013-07-18 23:29:41 +08:00