Sam Gateau 2c05349b06 Merge branch 'master' of https://github.com/highfidelity/hifi into yellow		2015-07-10 11:10:07 -07:00
..
animation
audio
audio-client
auto-updater
avatars
embedded-webserver
entities	remove unneeded const	2015-07-09 17:05:15 -07:00
entities-renderer	Merge branch 'master' of https://github.com/highfidelity/hifi into yellow	2015-07-10 11:10:07 -07:00
environment
fbx
gpu	Merge branch 'master' of https://github.com/highfidelity/hifi into yellow	2015-07-10 11:10:07 -07:00
model	Replacing setUniformTexture by setResourceTexture in order to differenciate the 2 types of binding points for the BUffers.	2015-07-10 11:03:12 -07:00
networking
octree
physics
render
render-utils	Merge branch 'master' of https://github.com/highfidelity/hifi into yellow	2015-07-10 11:10:07 -07:00
script-engine
shared
ui