Andrzej Kapolka e866c22518 Merge branch 'master' of https://github.com/worklist/hifi into kinected ... Conflicts: interface/src/Avatar.cpp		2013-07-03 10:15:11 -07:00
..
audio	adds code to show bandwidth details upon click and adds a checkbox to the menu to set visibility of the bandwidth bars	2013-06-30 17:08:01 +02:00
avatars	Merge branch 'master' of https://github.com/worklist/hifi into kinected	2013-07-03 10:15:11 -07:00
shared	rename the stat type argument in Logstash	2013-07-02 15:04:22 -07:00
voxels	re #19385: CR changes	2013-07-02 23:04:06 +02:00