monster merge...

all those changes marshmellow did..  and more...
This commit is contained in:
iceman1001 committed 2017-07-30 09:17:48 +02:00
1 parent 208550823d
commit f28da2da6e
107 files changed
+5087 -3777

No files matched your search

+1 -4
View File
@@ -97,10 +97,7 @@ void ProxGuiQT::MainLoop()
plotapp->exec();
}
ProxGuiQT::ProxGuiQT(int argc, char **argv) : plotapp(NULL), plotwidget(NULL),
argc(argc), argv(argv)
{
}
ProxGuiQT::ProxGuiQT(int argc, char **argv) : plotapp(NULL), plotwidget(NULL), argc(argc), argv(argv) {}
ProxGuiQT::~ProxGuiQT(void)
{