Sam Gateau d019ef4373 Merge branch 'master' of https://github.com/highfidelity/hifi into yellow		2015-07-01 18:12:11 -07:00
..
animation
audio	Allow scripted audio injectors to have options set.	2015-06-23 21:01:34 -07:00
audio-client	Merge pull request #5161 from PhilipRosedale/master	2015-06-22 12:09:08 -07:00
auto-updater	typo	2015-06-16 14:49:55 -06:00
avatars	Make renderDisplayName const	2015-06-18 15:22:49 +02:00
embedded-webserver
entities	add more detailed edit timing to entity server	2015-07-01 16:11:08 -07:00
entities-renderer	Making the first statusGetter noitify	2015-07-01 14:20:35 -07:00
environment
fbx	fix syntax	2015-06-19 17:13:29 +02:00
gpu	Adding the gpu_shader4 for linux and fixing function name for mac	2015-07-01 14:52:23 -07:00
model	merge from upstream	2015-06-18 15:03:09 -07:00
networking	Comments from CR	2015-07-01 14:55:24 -07:00
octree	add more detailed edit timing to entity server	2015-07-01 16:11:08 -07:00
physics	move function up so this builds in non-debug mode	2015-06-26 07:20:22 -07:00
render	Merge branch 'yellow' of https://github.com/samcake/hifi into stats	2015-07-01 17:31:15 -07:00
render-utils	Exposing the display Item Status to js to turn it on/off	2015-07-01 17:27:41 -07:00
script-engine	Exposing the display Item Status to js to turn it on/off	2015-07-01 17:27:41 -07:00
shared	Merge pull request #5201 from ctrlaltdavid/20590	2015-07-01 13:54:02 -07:00
ui	Merge pull request #5219 from venkatn93/master	2015-06-29 10:51:16 -07:00