Dante Ruiz 3eb9b37c29 Merge branch 'master' of github.com:highfidelity/hifi into webview-redesign		2017-04-17 16:41:15 +01:00
..
external
i18n
icon
resources	removed comments and non-needed files	2017-04-14 18:06:44 +01:00
src	Merge branch 'master' of github.com:highfidelity/hifi into webview-redesign	2017-04-17 16:41:15 +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