Philip Rosedale 57fcaceec2 Merge branch 'master' of https://github.com/worklist/hifi		2013-06-11 11:10:41 -07:00
..
audio	don't link STK library while not being used	2013-06-06 11:57:38 -07:00
avatars	fixed build issue	2013-06-04 17:40:34 -07:00
shared	remove hacked method to keep servers alive	2013-06-10 14:03:34 -07:00
voxels	removed const values per code review	2013-06-10 08:10:51 -07:00