Dante Ruiz e46d9da98f fixed merge conflict		2017-04-18 00:22:35 +01:00
..
external
i18n
icon
resources	fixed merge conflict	2017-04-18 00:22:35 +01:00
src	fixed merge conflict	2017-04-18 00:22:35 +01:00
ui	Revert "Actually merge from master"	2017-03-24 17:56:48 -07:00
CMakeLists.txt	Creating new avatar rendering library, prepping for crowd rendering project	2017-04-10 10:55:04 -07:00
interface.exe.manifest