merge with dev

This commit is contained in:
Desmis
2019-02-26 17:44:13 +01:00
49 changed files with 40 additions and 365 deletions

View File

@@ -978,7 +978,6 @@ public:
bool ff_AutoClipControl;
bool ff_clipControl;
bool exPos;
bool exPreser;
bool isUnchanged() const;
};