samuele3hu d997f72be2 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_assetsmanager ... nter # Please enter a commit message to explain why this merge is necessary, # especially if it merges an updated upstream into a topic branch. # # Lines starting with '#' will be ignored, and an empty message aborts # the commit.		2014-10-16 10:59:58 +08:00
..
cpp-empty-test	Merge pull request #8717 from MSOpenTech/wp8-dll	2014-10-16 09:33:43 +08:00
cpp-tests	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_assetsmanager	2014-10-16 10:59:58 +08:00
game-controller-test	Update project setting for lua-tests、lua-empty-test and lua-game-controller-test on the different platform and related test codes	2014-10-14 21:34:55 +08:00
lua-empty-test	Update the Xcode project setting for related test cases	2014-10-15 11:18:22 +08:00
lua-game-controller-test	Update project setting for lua-tests、lua-empty-test and lua-game-controller-test on the different platform and related test codes	2014-10-14 21:34:55 +08:00
lua-tests	Update the related AssetsManagerEx files and related project configure	2014-10-16 10:28:52 +08:00