merge wit dev

2019-11-07 07:17:19 +01:00
parent f72ec7bde2 a2d5ef356c
commit d621721ffe
417 changed files with 4353 additions and 5352 deletions
--- a/rtgui/wavelet.h
+++ b/rtgui/wavelet.h
@@ -27,7 +27,6 @@
 #include "thresholdadjuster.h"
 #include "colorprovider.h"
 #include "guiutils.h"
-#include "options.h"

 class EditDataProvider;