Cooode/cocos2d-x — pull request #6 by Cooode (2013-03-13 01:56:25+00:00)
Title: merge

merge