andyque 5624da5448 Merge branch 'v3' into cleanupBinaryLoader ... Conflicts: build/cocos2d_libs.xcodeproj/project.pbxproj cocos/editor-support/cocostudio/CCSGUIReader.h cocos/editor-support/cocostudio/proj.win32/libCocosStudio.vcxproj.filters		2014-06-23 09:37:39 +08:00
..
xcshareddata/xcschemes	Undo project file changes	2014-05-12 23:32:19 -07:00
project.pbxproj	Merge branch 'v3' into cleanupBinaryLoader	2014-06-23 09:37:39 +08:00