amantley 2b6d470467 Merge remote-tracking branch 'upstream/master' into glowingOrbMaster ... syncing with master		2018-06-26 15:16:41 -07:00
..
compiledResources
external
i18n
icon
resources	Merge pull request #13455 from howard-stearns/test-wearables	2018-06-25 16:44:53 -07:00
src	Merge remote-tracking branch 'upstream/master' into glowingOrbMaster	2018-06-26 15:16:41 -07:00
ui
CMakeLists.txt	merge 'master' into 'workload'	2018-06-18 13:40:08 -07:00
interface.exe.manifest