Cristian Luis Duarte e6a8b322b1 Android bottom bar - remove extra semicolon		2018-03-16 15:15:00 -03:00
..
compiledResources	Pre-merge cleanup	2018-01-14 19:48:12 -08:00
external	GLAD polish	2018-01-14 00:10:05 -08:00
i18n
icon
resources	Android bottom bar - remove extra semicolon	2018-03-16 15:15:00 -03:00
src	Merge branch 'stable' of https://github.com/highfidelity/hifi into new-master	2018-03-15 15:22:43 -07:00
ui
CMakeLists.txt	cleanup, don't compress rcc file to fix corruption	2018-03-12 13:05:03 -07:00
interface.exe.manifest