Bradley Austin Davis 00538c69cd Merge pull request #12257 from jherico/source_tree_qml ... Fix resource loading from source tree		2018-01-25 12:29:24 -08:00
..
animation
audio
audio-client
auto-updater
avatars	Merge pull request #12172 from highfidelity/android	2018-01-23 14:41:35 -08:00
avatars-renderer
baking
controllers
display-plugins	Merge branch 'master' of https://github.com/highfidelity/hifi into sendDataDescription	2018-01-25 10:39:43 -08:00
embedded-webserver
entities	Merge pull request #12225 from hyperlogic/bug-fix/sassy-avatar	2018-01-22 11:50:44 -08:00
entities-renderer	Merge remote-tracking branch 'upstream/master' into android	2018-01-22 15:07:30 -08:00
fbx	Merge pull request #12242 from hyperlogic/bug-fix/twisted-knees	2018-01-24 16:19:49 -08:00
gl
gpu
gpu-gl
gpu-gles
graphics	Merged with master	2018-01-24 09:53:38 +01:00
image
input-plugins
ktx
midi
model-networking
networking	Merge remote-tracking branch 'upstream/master' into android	2018-01-22 15:07:30 -08:00
octree
physics
plugins
pointers
procedural
recording
render	Merged with master	2018-01-24 09:53:38 +01:00
render-utils	Merged with master	2018-01-24 09:53:38 +01:00
script-engine	Merge branch 'master' of https://github.com/highfidelity/hifi into sendDataDescription	2018-01-25 10:39:43 -08:00
shared	Fix resource loading from source tree	2018-01-25 11:07:39 -08:00
trackers
ui	Merge remote-tracking branch 'upstream/master' into android	2018-01-22 15:07:30 -08:00
ui-plugins