stojce 594a20e248 Merge branch 'master' of https://github.com/worklist/hifi into 19466		2014-01-03 22:53:30 +01:00
..
audio	fix a glaring omission - actually move the audioInjector to QThread	2014-01-03 10:39:09 -08:00
avatars	#19466 - Add avatar scale to preferences panel	2014-01-03 21:02:56 +01:00
metavoxels	Fixed Xcode warnings.	2013-12-17 17:13:41 -08:00
octree	fix various compiler warnings on gcc	2014-01-02 15:58:03 -08:00
octree-server	more warnings fixes	2014-01-02 16:33:58 -08:00
particle-server	removed some debugging	2013-12-12 11:07:13 -08:00
particles	fix various compiler warnings on gcc	2014-01-02 15:58:03 -08:00
script-engine	open up ASI playSound method to ScriptEngine	2014-01-03 09:38:05 -08:00
shared	Merge pull request #1443 from birarda/master	2014-01-03 10:12:44 -08:00
voxel-server	attempt to fix build buster	2013-12-04 21:29:25 -08:00
voxels	Fix arm bending, compile warning.	2014-01-02 13:23:15 -08:00