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

This commit is contained in:
minggo 2013-09-17 13:40:05 +08:00
commit b7b73f5f92
1 changed files with 1 additions and 1 deletions

View File

@ -1 +1 @@
60d103435762fea41e137a0d126bc9a94ec71dc3
cd24df86bd74572c1ef45ee4af05633066a9d966