Huabing.Xu 47471e202d Merge branch 'v3' into fast_tmx ... Conflicts: cocos/2d/cocos2d.vcxproj.filters		2014-06-29 20:23:43 +08:00
..
xcshareddata/xcschemes	fix cocos2d tests and lu-bdinings and cocos2d_libs project config warnings	2014-03-20 10:14:25 +08:00
project.pbxproj	Merge branch 'v3' into fast_tmx	2014-06-29 20:23:43 +08:00