overte-HifiExperiments/interface
stojce 21b54fd07a Merge branch 'master' of https://github.com/worklist/hifi into 19508
Conflicts:
	interface/interface_en.ts
	interface/src/Menu.h
2014-03-16 09:25:31 +01:00
..
external Slight tweak to Visage instructions (in order not to overwrite our custom 2014-03-10 15:16:48 -07:00
resources QSpinBox, QDoubleSpinBox styling 2014-03-15 22:07:29 +01:00
src Merge branch 'master' of https://github.com/worklist/hifi into 19508 2014-03-16 09:25:31 +01:00
ui Merge branch 'master' of https://github.com/worklist/hifi into 19508 2014-03-14 21:05:30 +01:00
CMakeLists.txt Merge branch 'master' of https://github.com/worklist/hifi into 19495 2014-03-14 01:52:53 +01:00
interface.icns
interface_en.ts Merge branch 'master' of https://github.com/worklist/hifi into 19495 2014-03-15 19:46:26 +01:00
InterfaceConfig.h.in
InterfaceVersion.h.in