Brad Davis e1af9f8126 Merge remote-tracking branch 'upstream/master' into text-renderer		2015-02-04 21:04:47 -08:00
..
external
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	Merge remote-tracking branch 'upstream/master' into text-renderer	2015-02-04 21:04:47 -08:00
ui	Update runningScriptsWidgets px -> pt	2015-01-22 16:22:36 -08:00
CMakeLists.txt	Removing some dev modifications	2015-02-03 23:30:43 -08:00
interface_en.ts
InterfaceConfig.h.in
InterfaceVersion.h.in