volansystech 212627bd5d Merge branch 'master' into 21255		2017-05-29 17:51:45 +05:30
..
external
i18n
icon
resources	fixed merge conflict	2017-05-24 19:35:41 +01:00
src	Merge branch 'master' into 21255	2017-05-29 17:51:45 +05:30
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