Merge default branch

This commit is contained in:
Felix Kauselmann
2018-02-18 17:17:14 +01:00
parent 1815ba64a1
commit 09c8125f87
36 changed files with 2014 additions and 1897 deletions

View File

@ -7,8 +7,9 @@
#include "yacreader_flow_config_widget.h"
#include "api_key_dialog.h"
#ifndef NO_OPENGL
FlowType flowType = Strip;
#endif
OptionsDialog::OptionsDialog(QWidget * parent)
:YACReaderOptionsDialog(parent)