Philip Rosedale 3ed5b0e9be Merge pull request #4052 from cozza13/20253 ... CR for Job #20253 - Fix scripts that still link to highfidelity-public		2015-01-06 17:08:51 -08:00
..
external	Script updates and fixes to highfidelity-public	2015-01-06 17:04:42 -08:00
resources	Merge pull request #4027 from huffman/grid-shader-updates	2015-01-05 13:00:05 -08:00
src	Merge pull request #4050 from birarda/lasagna-not-spaghetti	2015-01-06 16:29:52 -08:00
ui	fix ui file	2015-01-06 09:55:49 -08:00
CMakeLists.txt	Merge branch 'master' of https://github.com/highfidelity/hifi into voxelEctomy	2014-12-31 10:50:53 -08:00
interface.icns
interface_en.ts
InterfaceConfig.h.in
InterfaceVersion.h.in