win32 pro
Merge branch 'master' of https://github.com/go3k/cocos2d-x