Brad Hefta-Gaub 202e39799a Merge pull request #5062 from ZappoMan/team-teaching ... Team teaching - merge from master		2015-06-05 12:21:10 -07:00
..
animation
audio
audio-client
avatars
embedded-webserver
entities	Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching	2015-06-05 11:06:10 -07:00
entities-renderer	Merge pull request #5062 from ZappoMan/team-teaching	2015-06-05 12:21:10 -07:00
environment
fbx
gpu	Add glLineWidth to Batch/GLBackend	2015-06-04 10:54:13 +02:00
model
networking	fixed packet number increment logic	2015-06-02 09:38:45 -07:00
octree	Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into lod	2015-06-03 19:47:51 +02:00
physics	Merge pull request #5027 from AndrewMeadows/isentropic	2015-06-05 10:41:06 -07:00
render	Some renaming for windows compiler	2015-06-05 13:23:58 +01:00
render-utils	Merge pull request #5051 from ZappoMan/team-teaching-optimize-offset	2015-06-05 09:26:45 -07:00
script-engine	adding caps for opaque and transparent draw jobs and the ui in js so we can debug the rendered items	2015-06-03 11:25:45 -07:00
shared	Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching	2015-06-05 11:06:10 -07:00
ui	Add new address bar dialog error message	2015-06-01 09:01:11 -07:00