Seth Alves db38503d57 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui		2017-01-26 13:48:59 -08:00
..
animation	add and remove some profile data points	2017-01-26 08:35:25 -08:00
audio	Merge branch 'master' of https://github.com/highfidelity/hifi into ess-pr	2017-01-25 13:06:49 -08:00
audio-client
auto-updater
avatars	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-01-26 13:48:59 -08:00
controllers
display-plugins
embedded-webserver
entities	merge from upstream	2017-01-25 15:57:53 -08:00
entities-renderer	merge from upstream	2017-01-25 15:57:53 -08:00
fbx
gl
gpu
gpu-gl	Attempt to account for sparse texture memory overhead	2017-01-25 10:59:49 -08:00
input-plugins
model
model-networking
networking	Merge branch 'master' of https://github.com/highfidelity/hifi into ess-pr	2017-01-25 13:06:49 -08:00
octree
physics	merge from upstream	2017-01-25 15:57:53 -08:00
plugins
procedural
recording
render
render-utils	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-01-26 13:48:59 -08:00
script-engine	merge from upstream	2017-01-25 15:57:53 -08:00
shared	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-01-26 13:48:59 -08:00
ui	merge from upstream	2017-01-25 15:57:53 -08:00
ui-plugins