axmol/tests/cpp-tests/proj.win8.1-universal
anniruddh.koppal e0b3091dcf Merge branch 'v3' of https://github.com/MSOpenTech/cocos2d-x into v3-winrt-audio
Conflicts:
	tests/cpp-tests/proj.win8.1-universal/cpp-tests.Shared/cpp-tests.Shared.vcxitems.filters
2015-05-18 19:21:48 -07:00
..
cpp-tests.Shared Merge branch 'v3' of https://github.com/MSOpenTech/cocos2d-x into v3-winrt-audio 2015-05-18 19:21:48 -07:00
cpp-tests.Windows disable INCREMENTAL for ARM builds. Fixes lnk2013 error 2015-04-21 08:50:43 -07:00
cpp-tests.WindowsPhone added CC_WINDOWS_PHONE_8_1 to preprocessor defines 2015-04-29 09:48:14 -07:00