Andrzej Kapolka 21ba9bf410 Because attempting to compile the new voxel texture shader causes my system ... (Ubuntu LTS, Intel graphics) to hang, change it to compile lazily when activated.		2014-07-07 11:22:17 -07:00
..
external	Merge branch 'master' of https://github.com/highfidelity/hifi	2014-07-03 09:25:03 -07:00
resources	Merge branch 'master' of https://github.com/highfidelity/hifi	2014-07-02 13:12:37 -07:00
src	Because attempting to compile the new voxel texture shader causes my system	2014-07-07 11:22:17 -07:00
ui	Merge pull request #3108 from huffman/19800	2014-07-02 15:46:56 -07:00
CMakeLists.txt	resolve conflicts on merge with upstream master	2014-07-01 11:02:25 -07:00
interface.icns
interface_en.ts	Merge branch master	2014-04-24 18:52:59 +05:30
InterfaceConfig.h.in	missed copyright cleanups in apache header	2014-04-09 09:44:38 -07:00
InterfaceVersion.h.in	missed copyright cleanups in apache header	2014-04-09 09:44:38 -07:00