tosh bc9279917d Merge branch 'master' of git://github.com/worklist/hifi into 19188 ... Conflicts: interface/src/starfield/renderer/Renderer.h		2013-04-19 03:09:53 +02:00
..
avatars	Merge remote-tracking branch 'upstream/master'	2013-04-18 13:36:43 -07:00
shared	Merge branch 'master' of git://github.com/worklist/hifi into 19188	2013-04-19 03:09:53 +02:00
voxels	add a new SimpleMovingAverage class, replaces CounterStats	2013-04-18 14:46:39 -07:00