Brad Davis ea74aac1d6 Working on cleaning up diff		2015-07-17 11:02:32 -07:00
..
external
icon
resources	Merge branch 'master' into plugins	2015-07-13 19:52:53 -07:00
src	Working on cleaning up diff	2015-07-17 11:02:32 -07:00
ui	Merge fixes	2015-07-13 19:07:44 -07:00
CMakeLists.txt	Merge remote-tracking branch 'upstream/master' into plugins	2015-07-03 06:17:35 -07:00
interface_en.ts
InterfaceConfig.h.in	Working on mac compilability	2015-07-01 23:03:33 -07:00
InterfaceVersion.h.in