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

This commit is contained in:
Dhilan007 2013-10-21 16:27:49 +08:00
commit 9a0fa3c181
1 changed files with 1 additions and 1 deletions

View File

@ -1 +1 @@
a791b9789e080d3e7530890cfbaa966fffef5f9e
1c487d29bdc2d80516e86e2ee93b1664e9f7df2f