Andrew Meadows 2f749e3c51 merge upstream/master into andrew/isentropic ... Conflicts: libraries/entities/src/TextEntityItem.h		2015-02-25 14:40:32 -08:00
..
external	Update Faceshift readme.txt with Windows instructions	2015-02-20 11:29:51 -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 upstream/master into andrew/isentropic	2015-02-25 14:40:32 -08:00
ui	Update preferences dialog to use layouts throughout	2015-02-19 14:02:15 -08:00
CMakeLists.txt	make correct version of bullet for windows	2015-02-23 12:50:53 -08:00
interface_en.ts	remove more references to voxels	2015-01-07 16:09:56 -08:00
InterfaceConfig.h.in
InterfaceVersion.h.in