Seth Alves 26639aac15 Merge pull request #8789 from Atlante45/fix/settings ... Use JSON for application Settings		2016-12-15 07:00:46 -08:00
..
resources	make default avatar mixer send bandwidth 5mbps	2016-12-13 17:04:25 -08:00
src	Merge branch 'master' of https://github.com/highfidelity/hifi into fix/settings	2016-11-21 13:05:08 -08:00
CMakeLists.txt	cmake fix	2016-09-06 17:40:44 -07:00