Merge branch 'dev' into metadata-exiv2

2023-08-06 10:25:49 -07:00
parent c557b320c2 8d0333120e
commit c5a0067eee
95 changed files with 8220 additions and 2998 deletions
--- a/rtengine/init.cc
+++ b/rtengine/init.cc
@@ -17,7 +17,8 @@
 *  along with RawTherapee.  If not, see <https://www.gnu.org/licenses/>.
 */
 #include <fftw3.h>
-#include "../rtgui/profilestorecombobox.h"
+#include <glibmm/miscutils.h>
+#include <glibmm/ustring.h>
 #include "color.h"
 #include "rtengine.h"
 #include "iccstore.h"