Brad Hefta-Gaub 392ff94ebe Merge branch 'master' of git://github.com/worklist/hifi into windows_build ... Conflicts: interface/src/DataServerClient.cpp interface/src/avatar/MyAvatar.cpp libraries/avatars/src/AvatarData.h		2014-01-13 15:06:26 -08:00
..
audio	more isnan() hacks	2014-01-12 23:11:06 -08:00
avatars	Merge branch 'master' of git://github.com/worklist/hifi into windows_build	2014-01-13 15:06:26 -08:00
metavoxels	more windows build tweaks, warnings and linking	2014-01-13 11:48:16 -08:00
octree	more type mismatch warning fixes	2014-01-13 00:46:43 -08:00
octree-server	more windows build fixes	2014-01-11 00:43:47 -08:00
particle-server	removed some debugging	2013-12-12 11:07:13 -08:00
particles	more type mismatch warning fixes	2014-01-13 00:46:43 -08:00
script-engine	use ScriptEngine in Particle::collideWithXXX() methods so that we get all script interfaces	2014-01-04 03:16:47 -08:00
shared	more windows build tweaks, warnings and linking	2014-01-13 11:48:16 -08:00
voxel-server	attempt to fix build buster	2013-12-04 21:29:25 -08:00
voxels	changed all fmin to std::min	2014-01-10 21:42:01 -08:00