Andrzej Kapolka c6af08d883 Merge branch 'master' of https://github.com/worklist/hifi ... Conflicts: avatar-mixer/src/main.cpp		2013-04-25 17:40:55 -07:00
..
avatars	Merge branch 'master' of https://github.com/worklist/hifi	2013-04-25 17:40:55 -07:00
shared	use class key for AgentListIterator friend in AgentList	2013-04-25 17:12:11 -07:00
voxels	fixed bug in initialization of false color (actually true color)	2013-04-22 18:07:58 -07:00