cocos2d/cocos2d-x — pull request #8002 by xseekerj (2014-09-11 05:34:31+00:00)
Title: CCDeprecated.h CCApplicationProtocol.h

solve conflict, OS_WINDOWS defined on shlwapi.h