Brad Davis f22682fe39 Merge remote-tracking branch 'upstream/master' into plugins ... Conflicts: interface/src/Application.cpp interface/src/Application.h		2015-06-01 22:59:10 -07:00
..
external
icon
resources	Untabify	2015-06-01 13:54:14 -07:00
src	Merge remote-tracking branch 'upstream/master' into plugins	2015-06-01 22:59:10 -07:00
ui	Remove scripts 'Tip' label	2015-05-13 09:32:17 -07:00
CMakeLists.txt	Trying to get widgets / windows working	2015-06-01 17:31:18 -07:00
interface_en.ts
InterfaceConfig.h.in
InterfaceVersion.h.in