Ryan Huffman 284c4d8ac0 Merge branch 'master' of github.com:highfidelity/hifi into 19864 ... Conflicts: interface/CMakeLists.txt		2014-08-19 11:59:53 -07:00
..
external	allow command line specification that an external be required	2014-08-11 09:51:36 -07:00
resources	Support for shadows on heightmaps.	2014-08-15 16:13:47 -07:00
src	Merge branch 'master' of github.com:highfidelity/hifi into 19864	2014-08-19 11:59:53 -07:00
ui	maxFramesOverDesired added; settable from domain page and preferences	2014-07-29 15:57:32 -07:00
CMakeLists.txt	Merge branch 'master' of github.com:highfidelity/hifi into 19864	2014-08-19 11:59:53 -07:00
interface.icns	update the interface icon	2014-07-07 11:46:57 -07:00
interface_en.ts	importVoxels() JS override: specify file and location	2014-08-03 14:01:37 -04:00
InterfaceConfig.h.in
InterfaceVersion.h.in