ZappoMan 0e501f4439 Merge branch 'master' of https://github.com/worklist/hifi into compressed_packets ... Conflicts: interface/src/Menu.cpp interface/src/Menu.h		2013-11-27 15:44:51 -08:00
..
audio	remove audio injectors that are starved and not added	2013-10-21 16:04:13 -07:00
avatars	Glow/shrink avatars when killed, send kill message when we move between	2013-11-22 16:23:40 -08:00
shared	Merge branch 'master' of https://github.com/worklist/hifi into compressed_packets	2013-11-27 15:44:51 -08:00
voxel-server-library	removed debug	2013-11-27 15:35:00 -08:00
voxels	properly handle sequence numbers to not skip when supressing duplicate packets	2013-11-27 15:33:48 -08:00