Skip to content

Commit

Permalink
Merge branch 'develop-v2' of github.com:cocos2d/cocos2d-iphone into d…
Browse files Browse the repository at this point in the history 
…evelop-v2
  • Loading branch information
@ricardoquesada
ricardoquesada committed Apr 4, 2013
2 parents 208dbd3 + ed83069 commit 6e4addd
Showing 1 changed file with 0 additions and 0 deletions.
Binary file modified Resources/TileMaps/iso-test.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 6e4addd

Please sign in to comment.