howard-stearns 6aad78c8e8 Merge branch 'fogbugz_2028_part2' of https://github.com/zfox23/hifi into centered-toolbar		2016-11-03 11:23:47 -07:00
..
external
i18n
icon
resources	Merge branch 'fogbugz_2028_part2' of https://github.com/zfox23/hifi into centered-toolbar	2016-11-03 11:23:47 -07:00
src	Get ready for merge	2016-11-03 11:20:08 -07:00
ui
CMakeLists.txt	Update VersionInfo.rc.in to use TARGET_NAME.exe as original filename	2016-11-01 09:07:56 -07:00
interface.exe.manifest