Zach Fox a4a4ba817f Fixup merge - whoops		2017-06-22 10:27:28 -07:00
..
external
i18n
icon
resources	Fixup merge - whoops	2017-06-22 10:27:28 -07:00
src	Merge pull request #10758 from howard-stearns/event-installer-interface-options	2017-06-21 16:46:06 -07:00
ui	Revert "Actually merge from master"	2017-03-24 17:56:48 -07:00
CMakeLists.txt	Migrate core avatar rendering functionality to library	2017-05-04 14:08:59 -07:00
interface.exe.manifest