andyque ef5d4ddf86 Merge remote-tracking branch 'upstream/v3' into v3 ... # Conflicts: # tests/cpp-tests/proj.win8.1-universal/cpp-tests.Shared/cpp-tests.Shared.vcxitems.filters		2015-07-14 11:24:38 +08: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.7-release' into v3	2015-07-13 22:44:54 +08:00
cpp-tests.Shared.vcxitems.filters	Merge remote-tracking branch 'upstream/v3' into v3	2015-07-14 11:24:38 +08:00