Brad Davis 4fa5a0eca4 Merge branch 'master' into oculus_old_renderer		2015-03-06 12:56:19 -08:00
..
external	Merging from upstream	2015-03-04 21:53:31 -08:00
icon	fix check for debug/release icon	2015-01-30 15:41:44 -08:00
resources	removed at symbol and added enter for teleport box	2015-02-19 14:49:00 -05:00
src	Merge branch 'master' into oculus_old_renderer	2015-03-06 12:56:19 -08:00
ui	Update preferences dialog to use layouts throughout	2015-02-19 14:02:15 -08:00
CMakeLists.txt	Updating cmake files after merging from master	2015-03-04 23:32:27 -08:00
interface_en.ts	remove more references to voxels	2015-01-07 16:09:56 -08:00
InterfaceConfig.h.in
InterfaceVersion.h.in