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

Browse Source

...

This commit is contained in:

samuele3hu 2014-05-23 19:15:46 +08:00

parent 3bd196f077 1b3a474646

commit 006f082f74

1 changed files with 0 additions and 0 deletions

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

BIN

tests/cpp-tests/Resources/Images/test_image_a8.pvr Executable file → Normal file

View File

Binary file not shown.