Bruce Brown b3ac4de1e6 Update Midi.h		2017-12-29 10:45:58 -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
embedded-webserver
entities	Merge branch 'master' of github.com:highfidelity/hifi into scale-wearables-with-avatar-3	2017-12-22 15:13:02 -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	Update Midi.h	2017-12-29 10:45:58 -08:00
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
pointers
procedural
recording
render
render-utils	Merge pull request #12017 from Zvork/glcolor	2017-12-22 14:25:51 -08:00
script-engine
shared	Merge pull request #11918 from sethalves/scale-wearables-with-avatar-3	2017-12-29 09:12:17 -08:00
trackers
ui
ui-plugins