Seth Alves 91cac892d2 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui		2017-03-21 14:04:58 -07:00
..
animation
audio
audio-client	Merge pull request #9935 from zzmp/fix/audio-initialization	2017-03-21 00:23:28 -04:00
auto-updater
avatars
controllers
display-plugins
embedded-webserver
entities	Merge pull request #9946 from sethalves/model-scripting-1	2017-03-21 09:26:32 -07:00
entities-renderer	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-03-21 08:43:35 -08:00
fbx	Delete old sitting points code	2017-03-20 17:29:44 -07:00
gl
gpu
gpu-gl
input-plugins
model
model-networking
networking
octree
physics	Merge pull request #9851 from AndrewMeadows/simulation-ownership-2	2017-03-20 10:20:11 -07:00
plugins
procedural
recording
render	Doubled-ish the size of the physics status icons, fixed texture coordinates to be right-side up.	2017-03-20 17:55:52 -04:00
render-utils	Merge pull request #9941 from Triplelexx/21232	2017-03-20 09:55:37 -07:00
script-engine	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-03-21 14:04:58 -07:00
shared
ui	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-03-21 08:43:35 -08:00
ui-plugins