David Rowe 5f91f583e8 Merge branch 'master' into 19976 ... Conflicts: interface/CMakeLists.txt		2014-10-24 20:34:45 -07:00
..
external	Revert "Reverb"	2014-10-22 22:46:37 -07:00
resources	Tweaks to heightfield conversion.	2014-10-22 18:22:21 -07:00
src	Merge branch 'master' into 19976	2014-10-24 20:34:45 -07:00
ui	Merge pull request #3593 from huffman/20024	2014-10-14 09:52:13 -07:00
CMakeLists.txt	Merge branch 'master' into 19976	2014-10-24 20:34:45 -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