Merge branch 'v3' of https://github.com/cocoscodeide/cocos2d-x into v3

Browse Source

Conflicts:
	templates/cpp-template-default/proj.ios_mac/HelloCpp.xcodeproj/project.pbxproj

...

This commit is contained in:

honghui 2014-11-12 18:12:07 +08:00

parent d4e0460ed4 a7f8199e65

commit 9656a31be9

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available