Dante Ruiz bb7c424d47 get ui working		2017-06-06 21:09:09 +01:00
..
external
i18n
icon
resources	get ui working	2017-06-06 21:09:09 +01:00
src	fixing merge conflicts	2017-06-06 16:42:08 +01: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