axmol/samples/Cpp
James Chen a425dd3dc0 Merge branch 'more_best_practices_fixes' of https://github.com/ricardoquesada/cocos2d-x into ricardoquesada-more_best_practices_fixes
Conflicts:
	cocos2dx/actions/CCActionTiledGrid.h
2013-07-18 15:46:14 +08:00
..
AssetsManagerTest issue #2410: [Android] Adding listener for CCDrawNode when application resume from background. 2013-07-17 12:53:30 +08:00
HelloCpp issue #2410: [Android] Adding listener for CCDrawNode when application resume from background. 2013-07-17 12:53:30 +08:00
SimpleGame issue #2410: [Android] Adding listener for CCDrawNode when application resume from background. 2013-07-17 12:53:30 +08:00
TestCpp Merge branch 'more_best_practices_fixes' of https://github.com/ricardoquesada/cocos2d-x into ricardoquesada-more_best_practices_fixes 2013-07-18 15:46:14 +08:00