merge with dev

This commit is contained in:
Desmis
2019-03-23 07:21:18 +01:00
52 changed files with 2233 additions and 2050 deletions

View File

@@ -29,6 +29,8 @@
#include "guiutils.h"
#include "options.h"
class EditDataProvider;
class Wavelet :
public ToolParamBlock,
public ThresholdAdjusterListener,