merge with dev

This commit is contained in:
Desmis
2018-05-05 09:37:58 +02:00
115 changed files with 1924 additions and 3142 deletions

View File

@@ -69,8 +69,6 @@ protected:
ImageSource* imgsrc;
SHMap* shmap;
ColorTemp currWB;
ColorTemp autoWB;