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
..
App.xaml	remove PhoneDirect3DXamlAppComponent namesapce refactor	2014-10-23 07:24:23 -07:00
App.xaml.cpp	updates to app.xaml code to correctly support touches on Microsoft AdControls for WP8.1	2015-05-12 19:39:40 -07:00
App.xaml.h	updates to app.xaml code to correctly support touches on Microsoft AdControls for WP8.1	2015-05-12 19:39:40 -07:00
cpp-tests.Shared.vcxitems	Merge branch 'v3' of https://github.com/MSOpenTech/cocos2d-x into v3-winrt-audio	2015-05-18 19:21:48 -07:00
cpp-tests.Shared.vcxitems.filters	Merge branch 'v3' of https://github.com/MSOpenTech/cocos2d-x into v3-winrt-audio	2015-05-18 19:21:48 -07:00