atlante45 34cbe317fa Merge branch 'master' of https://github.com/worklist/hifi into the_midget_are_coming ... Conflicts: interface/src/Avatar.cpp interface/src/Webcam.cpp		2013-07-12 17:57:20 -07:00
..
audio	couple more type squishes	2013-07-11 11:11:39 -07:00
avatars	added scale in avatar packets eand slots to change it from the menu	2013-07-12 17:51:47 -07:00
shared	Merge branch 'master' of https://github.com/worklist/hifi into the_midget_are_coming	2013-07-12 17:57:20 -07:00
voxels	tweaks to low res moving, made monochrome off by default	2013-07-12 14:11:35 -07:00