Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into iss2790-deprecate-ccarray

This commit is contained in:
James Chen 2013-12-07 23:32:49 +08:00
commit f406dcfebc
1 changed files with 1 additions and 1 deletions

@ -1 +1 @@
Subproject commit e4ce0d5a6240c303a591a4476564bd7080ab06c2
Subproject commit db718e871a7b59acdbefb679796c824d7a2b3ebf