overte-HifiExperiments/interface
LionTurtle 1300bf7de2 Merge remote-tracking branch 'upstream/master'
Conflicts:
	interface/src/avatar/Avatar.cpp
	interface/src/avatar/Avatar.h
2013-08-21 13:36:28 -07:00
..
external updates required for fervor updater with Qt5 2013-08-19 16:05:37 -07:00
resources Might as well convert the divide to a multiply. 2013-08-20 17:04:29 -07:00
src Merge remote-tracking branch 'upstream/master' 2013-08-21 13:36:28 -07:00
CMakeLists.txt remove unneeded package finds in interface CMakeLists 2013-08-20 09:56:50 -07:00
interface.icns update to newer interface icon 2013-05-15 14:43:35 -07:00
InterfaceConfig.h.in