RebeccaStankus f52a6d8eae Merge branch 'master' of https://github.com/highfidelity/hifi into log-filtering		2018-01-04 10:49:32 -08:00
..
animation
audio
audio-client
auto-updater
avatars
avatars-renderer	Merge branch 'master' of github.com:highfidelity/hifi into scale-wearables-with-avatar-3	2017-12-22 15:13:02 -08:00
baking
controllers
display-plugins	measure average time of 'present'	2017-12-20 17:41:08 -08:00
embedded-webserver
entities	Merge pull request #12075 from highfidelity/stable	2018-01-02 13:24:03 -08:00
entities-renderer	Merge pull request #11918 from sethalves/scale-wearables-with-avatar-3	2017-12-29 09:12:17 -08:00
fbx
gl
gpu
gpu-gl	Merge pull request #12017 from Zvork/glcolor	2017-12-22 14:25:51 -08:00
gpu-gles
image
input-plugins
ktx
midi
model
model-networking
networking	Merge pull request #12057 from birarda/61-1-merge-back	2017-12-22 16:26:08 -08:00
octree	Merge pull request #12024 from birarda/bug/entity-sequence-skip	2017-12-22 12:30:27 -08:00
physics
plugins	measure average time of 'present'	2017-12-20 17:41:08 -08:00
pointers
procedural
recording
render
render-utils	typo	2017-12-23 00:53:11 -08:00
script-engine
shared	More filter choices, search will clear	2018-01-03 11:35:46 -08:00
trackers
ui	Use buttons index	2017-12-27 23:50:15 +01:00
ui-plugins