Brad Davis a26373bd3a Fixing merge problem		2015-06-12 17:28:38 -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	Merge branch 'master' into plugins	2015-06-12 15:49:35 -07:00
src	Fixing merge problem	2015-06-12 17:28:38 -07:00
ui	Remove scripts 'Tip' label	2015-05-13 09:32:17 -07:00
CMakeLists.txt	Merge branch 'master' into plugins	2015-06-10 14:21:48 -07:00
interface_en.ts
InterfaceConfig.h.in
InterfaceVersion.h.in