Brad Davis 1dc392bb36 Merge pull request #6330 from Atlante45/master ... // FIXME incredibly evil....		2015-11-06 11:43:33 -08:00
..
animation	Merge branch 'master' of https://github.com/highfidelity/hifi into away	2015-11-05 11:58:08 -08:00
audio	Recording audio fixes	2015-11-05 16:46:59 -08:00
audio-client	constify audio client loop	2015-11-05 16:57:51 -08:00
auto-updater
avatars	Recording audio fixes	2015-11-05 16:46:59 -08:00
controllers	Bit of cleanup	2015-11-06 11:14:10 -08:00
display-plugins
embedded-webserver
entities
entities-renderer
environment
fbx
gl
gpu
input-plugins	Bit of cleanup	2015-11-06 11:14:10 -08:00
model
model-networking
networking
octree
physics
plugins	Fix double delete on shutdown	2015-11-06 11:13:10 -08:00
procedural
recording	Add recording classes	2015-11-06 11:14:46 -08:00
render
render-utils
script-engine
shared	fix bad time measurment in AtRestDetector	2015-11-04 10:47:39 -08:00
ui