David Rowe c8328e9b9f Merge branch 'master' into 21319		2017-05-09 08:04:27 +12:00
..
external
i18n
icon
resources	Merge branch 'master' into 21319	2017-05-09 08:04:27 +12:00
src	Merge pull request #10388 from humbletim/21308	2017-05-08 10:46:49 -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