cocos2d/cocos2d-x — pull request #1415 by minggo (2012-09-29 07:15:47+00:00)
Title: Multi resolution

Fix conflict of the pull request: https://github.com/cocos2d/cocos2d-x/pull/1372.
Remove CCDirector::m_obWinSizeInPixel and rename m_obWinSizeInPoint to m_obWinSize.