Brad Hefta-Gaub 7a3835eb33 Merge pull request #11945 from jherico/android_nov ... Updating android toolchain for QML		2018-01-05 13:34:03 -08:00
..
src/avatars-renderer	Merge branch 'master' of github.com:highfidelity/hifi into scale-wearables-with-avatar-3	2017-12-22 15:13:02 -08:00
CMakeLists.txt	Fix polyvox archive, correct build errors, add additional libraries	2017-12-12 18:29:36 -08:00