Andrzej Kapolka 8a0ff4acf5 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels ... Conflicts: interface/src/ui/MetavoxelEditor.cpp		2014-11-13 12:17:37 -08:00
..
external	typo	2014-10-23 14:07:42 -07:00
resources	Yet more heightfield spanner bits.	2014-11-12 15:40:54 -08:00
src	Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels	2014-11-13 12:17:37 -08:00
ui	Revert "Worklist #20074"	2014-10-30 14:33:10 -07:00
CMakeLists.txt	Merge pull request #3652 from ctrlaltdavid/19976	2014-10-29 20:46:12 -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