overte-HifiExperiments/interface
Brad Davis c360dde71a Merge branch 'master' into render_cursor
Conflicts:
	interface/src/Application.cpp
2015-06-08 20:18:32 -07:00
..
external remove visage related files 2015-04-17 13:40:31 -07:00
icon
resources add a sound once first AM packet received 2015-06-08 11:30:12 -07:00
src Merge branch 'master' into render_cursor 2015-06-08 20:18:32 -07:00
ui Remove scripts 'Tip' label 2015-05-13 09:32:17 -07:00
CMakeLists.txt merging and updating 2015-05-20 16:50:43 -07:00
interface_en.ts
InterfaceConfig.h.in
InterfaceVersion.h.in