David Rowe c20cd40275 Merge branch 'master' into 20601 ... Conflicts: interface/src/avatar/Head.cpp		2015-07-02 09:51:47 -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	make the tooltip background darker	2015-06-29 11:05:59 -07:00
src	Merge branch 'master' into 20601	2015-07-02 09:51:47 -07:00
ui	Checkpoint auto updater	2015-06-02 19:32:03 -06:00
CMakeLists.txt	Enhancing PR installer titles	2015-07-01 14:13:37 -04:00
interface_en.ts	remove more references to voxels	2015-01-07 16:09:56 -08:00
InterfaceConfig.h.in
InterfaceVersion.h.in