Zach Fox b5ba4a109d Merge from upstream/master		2017-03-28 17:37:34 -07:00
..
animation	Merge from upstream/master	2017-03-28 17:37:34 -07:00
audio	mv AudioNoiseGate to audio	2017-03-15 00:15:33 +00:00
audio-client	Revert "Actually merge from master"	2017-03-24 17:56:48 -07:00
auto-updater
avatars	Merge branch 'master' of https://github.com/highfidelity/hifi into PAL_v2	2017-03-27 09:10:12 -07:00
controllers
display-plugins	Revert "Actually merge from master"	2017-03-24 17:56:48 -07:00
embedded-webserver
entities	Merge from upstream/master	2017-03-28 17:37:34 -07:00
entities-renderer	Merge from upstream/master	2017-03-28 17:37:34 -07:00
fbx	Merge from upstream/master	2017-03-28 17:37:34 -07:00
gl	Merge from upstream/master	2017-03-28 17:37:34 -07:00
gpu	Merge from upstream/master	2017-03-28 17:37:34 -07:00
gpu-gl	Merge from upstream/master	2017-03-28 17:37:34 -07:00
input-plugins	Merge from upstream/master	2017-03-28 17:37:34 -07:00
ktx	Revert "Actually merge from master"	2017-03-24 17:56:48 -07:00
model	Merge from upstream/master	2017-03-28 17:37:34 -07:00
model-networking	Merge from upstream/master	2017-03-28 17:37:34 -07:00
networking	Merge branch 'master' of https://github.com/highfidelity/hifi into PAL_v2	2017-03-27 09:10:12 -07:00
octree	Revert "Actually merge from master"	2017-03-24 17:56:48 -07:00
physics	Revert "Actually merge from master"	2017-03-24 17:56:48 -07:00
plugins	Expose ASW activation status, provide normalized present rate information	2017-03-03 10:46:05 -08:00
procedural
recording	Revert "Actually merge from master"	2017-03-24 17:56:48 -07:00
render	Revert "Actually merge from master"	2017-03-24 17:56:48 -07:00
render-utils	Merge from upstream/master	2017-03-28 17:37:34 -07:00
script-engine	Merge from upstream/master	2017-03-28 17:37:34 -07:00
shared	Merge from upstream/master	2017-03-28 17:37:34 -07:00
ui	Merge from upstream/master	2017-03-28 17:37:34 -07:00
ui-plugins