avexer/cocos2d-x — pull request #1 by avexer (2014-01-19 02:57:42+00:00)
Title: merge with cocos2d-x

merge with cocos2d-x