samuele3hu 893e0b0a08 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3_new_module ... Conflicts: build/cocos2d_libs.xcodeproj/project.pbxproj		2014-08-25 11:45:29 +08:00
..
HelloCpp.xcodeproj	Adjust cpp-template-default template	2014-08-22 13:50:28 +08:00
ios	OpenGL context attributions setting revise -2	2014-08-22 16:22:16 +08:00
mac	Add configuration in templates to set the bundle identity of Mac & iOS project.	2014-07-08 10:22:08 +08:00