samcake 044110e4f3 Merge branch 'master' of https://github.com/highfidelity/hifi into brown		2017-05-24 15:40:40 -07:00
..
animation	Merge branch 'master' into feature/faster-ik-iterations	2017-05-23 09:10:17 -07:00
audio
audio-client
auto-updater
avatars
avatars-renderer	base scale attachment on the natural dimensions	2017-05-23 17:53:08 +02:00
controllers
display-plugins
embedded-webserver
entities	Merging with upstream	2017-05-23 12:12:31 -07:00
entities-renderer	some clean up:	2017-05-23 18:00:22 -07:00
fbx
gl
gpu	brining the new counters to 4.1	2017-05-22 17:34:06 -07:00
gpu-gl	removing comments not needed anymore	2017-05-23 14:16:42 -07:00
image
input-plugins
ktx	Merge pull request #10500 from Atlante45/feat/bc7	2017-05-22 16:47:27 -07:00
model
model-networking
networking	Merge pull request #10525 from seefo/master	2017-05-22 21:42:16 -07:00
octree
physics	Merge branch 'master' of https://github.com/highfidelity/hifi into ambient	2017-05-22 10:56:00 -07:00
plugins
procedural
recording
render
render-utils	some clean up:	2017-05-23 18:00:22 -07:00
script-engine	Merge pull request #10536 from misslivirose/fix/check-extension-running-scripts	2017-05-23 22:15:50 -07:00
shared
trackers
ui
ui-plugins