Brad Davis 2758718c8d Merge remote-tracking branch 'upstream/master' into plugins ... Conflicts: interface/src/ui/DialogsManager.cpp interface/src/ui/DialogsManager.h		2015-05-29 16:50:59 -07:00
..
external	remove visage related files	2015-04-17 13:40:31 -07:00
icon
resources	Working on web entities	2015-05-13 00:27:57 -07:00
src	Merge remote-tracking branch 'upstream/master' into plugins	2015-05-29 16:50:59 -07:00
ui	Remove scripts 'Tip' label	2015-05-13 09:32:17 -07:00
CMakeLists.txt	Making (most) plugins into a library	2015-05-29 16:49:11 -07:00
interface_en.ts
InterfaceConfig.h.in
InterfaceVersion.h.in