overte-HifiExperiments/interface
David Rowe d7b42e264e Merge branch 'master' into 20639
Conflicts:
	interface/CMakeLists.txt
2015-08-05 16:49:06 -07:00
..
external Merge branch 'master' into 20639 2015-08-05 16:49:06 -07:00
icon
resources Use single file robot model as fallback for full avatar models 2015-07-29 19:34:05 -07:00
src Merge branch 'master' into 20639 2015-08-05 16:49:06 -07:00
ui Rename and refactor eye deflection slider 2015-07-16 14:05:34 -07:00
CMakeLists.txt Merge branch 'master' into 20639 2015-08-05 16:49:06 -07:00
interface_en.ts
InterfaceVersion.h.in