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

This commit is contained in:
samuele3hu 2014-03-11 17:49:33 +08:00
commit 3fe51ed518
1 changed files with 1 additions and 1 deletions

@ -1 +1 @@
Subproject commit e5e7a2eef58a754f99e1c949a72d53148ea7a269
Subproject commit 013a5f557b46f9c947a6f5ffd93dd635a6877273