Sam Gateau 1746c1de46 t :wq ... Merge branch 'master' of https://github.com/highfidelity/hifi into temp1		2015-03-25 16:27:32 -07:00
..
animation	remove use of include_dependency_includes and use cmake	2015-02-18 14:12:05 -08:00
audio	fix stereo to stereo resampling	2015-03-10 15:50:30 -07:00
audio-client	Wrong byte array size in audio client	2015-03-17 16:40:26 +01:00
avatars	PhysicsEngine doesn't need AvatarData	2015-03-24 17:38:35 -07:00
embedded-webserver	remove use of include_dependency_includes and use cmake	2015-02-18 14:12:05 -08:00
entities	also attempt to clean up placement of PROP_ATTRIBUTION in the stream	2015-03-20 13:21:29 -07:00
entities-renderer	use .isEmpty on urls rather than convert them to strings and compare to empty string	2015-03-19 15:48:48 -07:00
environment	test the possibility that zlib is no longer required	2015-02-19 15:29:28 -08:00
fbx	fix attempt to avoid normalizing a zero length vector, other adjustments to respond to code review	2015-03-16 10:03:55 -07:00
gpu	t :wq	2015-03-25 16:27:32 -07:00
model	Revisiting the rendering pipeline pick and trying to use our brand new gpu::Pipeline	2015-03-24 14:58:41 -07:00
networking	Merge pull request #4507 from birarda/friends-only-location	2015-03-25 13:48:08 -07:00
octree	tweaks to the LOD Tools UI	2015-03-23 16:44:19 -07:00
physics	remove extra whitespace	2015-03-25 11:06:19 -07:00
render-utils	Merge branch 'master' of https://github.com/highfidelity/hifi into temp1	2015-03-25 10:16:43 -07:00
script-engine	Switching to .com	2015-03-25 12:36:37 -06:00
shared	type & squish again	2015-03-19 17:29:57 -07:00