samuele3hu f00187d3bb Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3D ... Conflicts: tools/tolua/cocos2dx.ini		2014-09-29 09:48:35 +08:00
..
xcshareddata/xcschemes	Adds missing xcshared data for missing projects	2014-09-05 14:32:14 -07:00
project.pbxproj	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3D	2014-09-29 09:48:35 +08:00