cocos2d/cocos2d-x — pull request #8001 by xseekerj (2014-09-11 05:29:58+00:00)
Title: Update CCApplicationProtocol.h, CCDeprecated.h

solve conflict, OS_WINDOWS already defined on shlwapi.h