Andrzej Kapolka 865b495e6c Merge branch 'master' of https://github.com/worklist/hifi into debone ... Conflicts: interface/src/Audio.cpp interface/src/Menu.cpp interface/src/avatar/Avatar.h interface/src/avatar/MyAvatar.cpp interface/src/devices/Webcam.cpp interface/src/devices/Webcam.h interface/src/renderer/FBXReader.cpp		2014-01-16 13:35:03 -08:00
..
BandwidthDialog.cpp	Fixed ui related files memory wastes	2013-09-03 14:47:50 -07:00
BandwidthDialog.h	Fixed ui related files memory wastes	2013-09-03 14:47:50 -07:00
ChatEntry.cpp	windows type mismatch warning fixes	2014-01-13 00:30:23 -08:00
ChatEntry.h	Various fixes, removed the bulk of main.cpp.	2013-05-13 23:15:45 -07:00
LodToolsDialog.cpp	first cut at splitting out octree base classes	2013-12-03 17:32:02 -08:00
LodToolsDialog.h	first cut at new voxel scene stats	2013-11-05 10:29:56 -08:00
LogDialog.cpp	switch from pthread mutex to QMutex	2014-01-10 18:01:36 -08:00
LogDialog.h	switch from pthread mutex to QMutex	2014-01-10 18:01:36 -08:00
RearMirrorTools.cpp	Rear view zoom level	2013-10-29 20:51:14 +01:00
RearMirrorTools.h	Rear view zoom level	2013-10-29 20:51:14 +01:00
TextRenderer.cpp	Slight fix for shadows; we were drawing an unnecessary layer of text.	2013-05-16 16:23:11 -07:00
TextRenderer.h	adds missing include "InterfaceConfig.h" for OpenGL types	2013-05-21 00:59:29 +02:00
VoxelStatsDialog.cpp	Merge branch 'master' of https://github.com/worklist/hifi into debone	2014-01-16 13:35:03 -08:00
VoxelStatsDialog.h	added particle server details to voxel stats dialog	2013-12-17 11:32:20 -08:00