Andrzej Kapolka 9c2d4776f9 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels		2014-08-12 18:21:23 -07:00
..
external	allow command line specification that an external be required	2014-08-11 09:51:36 -07:00
resources	Working on rejiggering the heightfield tiles.	2014-08-12 10:56:15 -07:00
src	Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels	2014-08-12 18:21:23 -07:00
ui	maxFramesOverDesired added; settable from domain page and preferences	2014-07-29 15:57:32 -07:00
CMakeLists.txt	Merge pull request #3271 from birarda/take-out-the-trash	2014-08-12 14:30:17 -07:00
interface.icns	update the interface icon	2014-07-07 11:46:57 -07:00
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