Seth Alves b8fc9e2469 Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains		2018-03-07 07:40:35 -08:00
..
animation
audio	make sure dont make audio devices that don't use stereo use stereo	2018-03-02 10:56:44 -08:00
audio-client	Merge pull request #12533 from druiz17/stereo-checkbox	2018-03-05 12:45:01 -08:00
auto-updater
avatars
avatars-renderer	more code review response	2018-03-02 11:35:34 -08:00
baking
controllers
display-plugins	Disable virtual trackpad rendering on non-Android builds	2018-03-02 11:12:44 -08:00
embedded-webserver
entities	cleanups	2018-03-02 10:38:35 -08:00
entities-renderer	Merge remote-tracking branch 'upstream/master' into android_dev	2018-02-27 13:44:00 -08:00
fbx
gl
gpu	Merge remote-tracking branch 'upstream/master' into android_dev	2018-02-27 13:44:00 -08:00
gpu-gl
gpu-gles
graphics	Merge remote-tracking branch 'upstream/master' into android_dev	2018-02-27 13:44:00 -08:00
graphics-scripting
image
input-plugins
ktx
midi
model-networking	gather together the url scheme constants, name them consistently	2018-03-02 20:39:38 -08:00
networking	some code-review induced changes	2018-03-06 13:11:09 -08:00
octree	Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains	2018-03-07 07:40:35 -08:00
physics
plugins
pointers
procedural
qml
recording
render	Resolving conflicts	2018-03-02 10:36:55 -08:00
render-utils	Resolving conflicts	2018-03-02 14:20:33 -08:00
script-engine	make sure dont make audio devices that don't use stereo use stereo	2018-03-02 10:56:44 -08:00
shared	merge from upstream	2018-03-02 09:57:27 -08:00
task
trackers
ui	Merge pull request #12543 from zfox23/improveFontLoading	2018-03-02 14:22:17 -08:00
ui-plugins
workload