howard-stearns e6746acf4c Merge branch 'master' of https://github.com/highfidelity/hifi into discovery		2016-08-11 15:40:26 -07:00
..
animation
audio
audio-client
auto-updater
avatars	Fix crash when adding new attachment	2016-08-10 10:41:16 +12:00
controllers
display-plugins
embedded-webserver
entities	Merge pull request #8333 from SamGondelman/miscFixes	2016-08-10 11:06:50 -07:00
entities-renderer	Merge pull request #8409 from SamGondelman/loadingFade	2016-08-11 12:02:57 -07:00
fbx
gl	Generalize atp handling in network access managers	2016-08-09 11:46:08 -07:00
gpu	Merge pull request #8333 from SamGondelman/miscFixes	2016-08-10 11:06:50 -07:00
gpu-gl
input-plugins
model	Merge pull request #8383 from AndrewMeadows/faster-is-better	2016-08-11 13:10:44 -07:00
model-networking	Fix warning using init list for QVariantMap	2016-08-08 16:03:03 -07:00
networking	Merge branch 'master' of https://github.com/highfidelity/hifi into discovery	2016-08-11 15:40:26 -07:00
octree
physics	adjust ground-to-fly logic	2016-08-04 11:34:42 -07:00
plugins
procedural	fix procedural transparency	2016-08-10 13:49:35 -07:00
recording
render
render-utils	Merge pull request #8333 from SamGondelman/miscFixes	2016-08-10 11:06:50 -07:00
script-engine	Add some asserts	2016-08-08 15:12:17 -07:00
shared	Merge remote-tracking branch 'upstream/master' into loadingFade	2016-08-09 14:55:14 -07:00
steamworks-wrapper
ui	Add atp support to qml	2016-08-08 15:12:17 -07:00
ui-plugins