Merge branch 'develop-3.0' of https://github.com/cocos2d/cocos2d-html… · jianglong0156/cocos2d-js@cf78b57 · GitHub

Commit

Merge branch 'develop-3.0' of https://github.com/cocos2d/cocos2d-html5 …

Browse files

…into develop-3.0

Loading branch information

pandamicro committed Jan 14, 2014

2 parents 56d73e0 + 5aae010 commit cf78b57