Brad Davis 9b6c20d93c Merge remote-tracking branch 'upstream/master' into web-entity		2015-05-13 09:49:53 -07:00
..
external	remove visage related files	2015-04-17 13:40:31 -07:00
icon	fix check for debug/release icon	2015-01-30 15:41:44 -08:00
resources	Working on web entities	2015-05-13 00:27:57 -07:00
src	Merge remote-tracking branch 'upstream/master' into web-entity	2015-05-13 09:49:53 -07:00
ui	Better preference description	2015-05-11 17:19:50 -07:00
CMakeLists.txt	add a macro to recursively correctly handle resources	2015-04-27 16:02:52 -07:00
interface_en.ts	remove more references to voxels	2015-01-07 16:09:56 -08:00
InterfaceConfig.h.in
InterfaceVersion.h.in