overte-HifiExperiments/libraries
tosh bfaeb4a4d9 Merge branch 'master' of git://github.com/worklist/hifi
Conflicts:
	libraries/avatars/src/AvatarData.cpp
2013-05-21 18:46:20 +02:00
..
audio use AgentList defaults when AIM has no socket or address set 2013-05-20 11:48:50 -07:00
avatars Merge branch 'master' of git://github.com/worklist/hifi 2013-05-21 18:46:20 +02:00
shared refactors logging 2013-05-21 01:00:10 +02:00
voxels refactors logging 2013-05-21 01:00:10 +02:00