ZappoMan ec0c350f60 Merge branch 'master' of https://github.com/worklist/hifi into virtualEntities ... Conflicts: interface/src/Application.cpp interface/src/DatagramProcessor.cpp libraries/script-engine/src/ScriptEngine.cpp		2014-07-03 14:20:40 -07:00
..
audio	fixed more small bugs with AudioRingBuffer constructor	2014-07-03 12:06:18 -07:00
metavoxels	Include an additional bit with the objects that says whether what follows is	2014-06-30 12:35:34 -07:00
networking	Merge pull request #3107 from wangyix/master	2014-07-03 13:32:31 -07:00
octree	virtual entities checkpoint	2014-07-03 09:07:11 -07:00
physics	fixed some windows warnings	2014-06-24 20:07:47 -07:00
shared	add AngularConstraint::softClamp() for hands	2014-07-03 08:40:34 -07:00
CMakeLists.txt	complete quoting of varous Cmake commands, closes #1999	2014-03-03 12:15:05 -08:00