Seth Alves 4fa6f388b9 Merge branch 'master' of github.com:highfidelity/hifi into polyvox		2015-05-27 18:20:59 -07:00
..
external
icon
resources	Working on web entities	2015-05-13 00:27:57 -07:00
src	Merge branch 'master' of github.com:highfidelity/hifi into polyvox	2015-05-27 18:20:59 -07:00
ui	Remove scripts 'Tip' label	2015-05-13 09:32:17 -07:00
CMakeLists.txt
interface_en.ts
InterfaceConfig.h.in
InterfaceVersion.h.in