overte-HifiExperiments/interface
stojce 355a1f3da3 Merge branch 'master' of https://github.com/worklist/hifi into 19435
Conflicts:
	interface/src/avatar/Head.cpp
	interface/src/avatar/Head.h
2013-10-11 22:54:59 +02:00
..
external begin to remove fervor + quazip 2013-09-26 17:39:33 -07:00
resources remove unused resource 2013-10-05 13:21:34 +02:00
src Merge branch 'master' of https://github.com/worklist/hifi into 19435 2013-10-11 22:54:59 +02:00
CMakeLists.txt fix broken InfoView after removing fervor 2013-09-30 10:39:33 -07:00
interface.icns
InterfaceConfig.h.in