samcake ae6e625894 Merge branch 'master' of https://github.com/highfidelity/hifi into orange		2016-02-24 17:30:40 -08:00
..
animation
audio
audio-client
auto-updater
avatars
controllers
display-plugins
embedded-webserver
entities
entities-renderer	Merge branch 'master' of https://github.com/highfidelity/hifi into orange	2016-02-24 17:30:40 -08:00
fbx	Adding support for emissive and occlusion maps, on to pr land	2016-02-24 17:30:29 -08:00
gl
gpu
input-plugins
model	Adding support for emissive and occlusion maps, on to pr land	2016-02-24 17:30:29 -08:00
model-networking	Adding support for emissive and occlusion maps, on to pr land	2016-02-24 17:30:29 -08:00
networking
octree
physics	Revert "Physics: extrapolate kinematic objects as well as dynamic ones."	2016-02-23 13:26:15 -08:00
plugins
procedural
recording
render	Merge branch 'master' of https://github.com/highfidelity/hifi into orange	2016-02-24 17:30:40 -08:00
render-utils	Merge branch 'master' of https://github.com/highfidelity/hifi into orange	2016-02-24 17:30:40 -08:00
script-engine
shared	Merge pull request #7171 from jherico/avatar_qml_location	2016-02-24 11:37:12 -08:00
ui	Fix window confirmation dialog	2016-02-23 20:37:25 -08:00