Thijs Wenker e913095af5 Merge branch 'master' of https://github.com/worklist/hifi into 20216 ... Conflicts: interface/CMakeLists.txt		2014-12-19 13:53:33 +01:00
..
external	fix typo from overwrite of gverb/readme.txt	2014-11-26 10:41:23 -08:00
resources	remove old unused shaders	2014-12-11 13:59:21 -08:00
src	Merge branch 'master' of https://github.com/worklist/hifi into 20216	2014-12-19 13:53:33 +01:00
ui	Revert "Worklist #20074"	2014-10-30 14:33:10 -07:00
CMakeLists.txt	Merge branch 'master' of https://github.com/worklist/hifi into 20216	2014-12-19 13:53:33 +01:00
interface.icns
interface_en.ts
InterfaceConfig.h.in
InterfaceVersion.h.in