Resolve exiv2 merge conflicts and merge with

2020-10-16 11:45:26 +02:00
parent e093555c66 28f0bc14da
commit 8b4389ade9
49 changed files with 1531 additions and 17588 deletions
--- a/rtgui/shcselector.cc
+++ b/rtgui/shcselector.cc
@@ -20,6 +20,7 @@
 #include <iomanip>

 #include "shcselector.h"
+
 #include "multilangmgr.h"
 #include "mycurve.h"
 #include "rtscalable.h"