merge with dev

This commit is contained in:
Desmis
2019-11-10 08:56:38 +01:00
99 changed files with 482 additions and 199 deletions

View File

@@ -21,6 +21,7 @@
#include <string>
#include "guiutils.h"
#include "multilangmgr.h"
#include "popuptogglebutton.h"
#include "../rtengine/LUT.h"
#include <cstring>