merge with dev

This commit is contained in:
Desmis
2018-04-30 07:49:49 +02:00
56 changed files with 465 additions and 989 deletions

View File

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