Brad Hefta-Gaub 483155f246 Merge pull request #3989 from birarda/master ... fix luckily linked dependencies in prep for shared hifi libraries		2014-12-21 11:34:43 -08: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 pull request #3989 from birarda/master	2014-12-21 11:34:43 -08:00
ui	Revert "Worklist #20074"	2014-10-30 14:33:10 -07:00
CMakeLists.txt	resolve conflicts on merge with upstream master	2014-12-19 14:48:18 -08:00
interface.icns
interface_en.ts
InterfaceConfig.h.in
InterfaceVersion.h.in