Brad Davis 1bae590389 Merge remote-tracking branch 'upstream/master' into plugins ... Conflicts: interface/src/Application.cpp		2015-06-15 16:13:02 -07:00
..
external
icon
resources	Merge branch 'master' into plugins	2015-06-12 15:49:35 -07:00
src	Merge remote-tracking branch 'upstream/master' into plugins	2015-06-15 16:13:02 -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