Seth Alves 774cb33303 Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher-1		2017-08-15 09:17:52 -07:00
..
animation	Switch order of precondition and setSecondaryTargets	2017-08-01 13:17:33 -07:00
audio
audio-client	fix typo	2017-08-09 20:11:52 -07:00
auto-updater
avatars	Merge pull request #11083 from Menithal/experimental-face-expressions	2017-08-14 14:19:08 -07:00
avatars-renderer	Merge pull request #11021 from Zvork/fade2	2017-08-10 13:48:30 -07:00
controllers	Merge branch 'master' into feature/secondary-pose-support	2017-08-04 16:11:13 -07:00
display-plugins
embedded-webserver
entities	possibly fix most annoying crash	2017-08-08 18:10:53 -07:00
entities-renderer	Merge pull request #11021 from Zvork/fade2	2017-08-10 13:48:30 -07:00
fbx
gl
gpu	merge from master	2017-08-10 15:43:23 -07:00
gpu-gl	Merge pull request #11021 from Zvork/fade2	2017-08-10 13:48:30 -07:00
image
input-plugins
ktx
midi
model
model-networking
networking	missed some statics	2017-08-06 13:12:27 -07:00
octree
physics	Merge pull request #11048 from 1P-Cusack/21389	2017-08-03 09:04:31 -07:00
plugins	Merge branch 'master' of https://github.com/highfidelity/hifi into sharks	2017-08-07 13:29:00 -07:00
procedural
recording
render	Merge pull request #11021 from Zvork/fade2	2017-08-10 13:48:30 -07:00
render-utils	merge from master	2017-08-10 15:43:23 -07:00
script-engine	small revisions to bracketing/variable name	2017-08-04 16:58:33 -07:00
shared	Merge branch 'master' of https://github.com/highfidelity/hifi into sharks	2017-08-07 13:29:00 -07:00
trackers
ui	adjust various things that cause a crash-on-exit on Linux	2017-08-06 11:57:55 -07:00
ui-plugins