Cleared rebase-conflicts in the cocos2d.vxcproj.filters.

Resolution same warnings (VS2010).