Stephen Birarda e07ce23825 resolve conflicts on merge with upstream master		2015-02-03 10:25:17 -08:00
..
external	handle gverb move to audio-client	2015-01-29 12:44:03 -08:00
icon	fix check for debug/release icon	2015-01-30 15:41:44 -08:00
resources	Fix for misaligned color/material textures when resolution is greater than the	2015-01-20 13:07:35 -08:00
src	resolve conflicts on merge with upstream master	2015-02-03 10:25:17 -08:00
ui	Update runningScriptsWidgets px -> pt	2015-01-22 16:22:36 -08:00
CMakeLists.txt	resolve conflicts on merge with upstream/master	2015-02-02 17:10:13 -08:00
interface_en.ts	remove more references to voxels	2015-01-07 16:09:56 -08:00
InterfaceConfig.h.in
InterfaceVersion.h.in