Andrew Meadows 328167464f Merge branch '19908' of github.com:huffman/hifi into huffman-19908 ... Conflicts: interface/src/Menu.cpp		2014-08-21 09:21:24 -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 '19908' of github.com:huffman/hifi into huffman-19908	2014-08-21 09:21:24 -07:00
ui	maxFramesOverDesired added; settable from domain page and preferences	2014-07-29 15:57:32 -07:00
CMakeLists.txt	Add AppKit as a dependency in interface CMakeLists.txt	2014-08-19 22:17:09 -07:00
interface.icns
interface_en.ts	importVoxels() JS override: specify file and location	2014-08-03 14:01:37 -04:00
InterfaceConfig.h.in
InterfaceVersion.h.in