Merge dev into multi-external-editor

2021-06-28 22:03:14 -07:00
parent d9fe87569d 4ab54c9fda
commit 72fe8d6049
144 changed files with 8191 additions and 2187 deletions
--- a/rtgui/CMakeLists.txt
+++ b/rtgui/CMakeLists.txt
@@ -151,6 +151,7 @@ set(NONCLISOURCEFILES
    softlight.cc
    soundman.cc
    splash.cc
+    spot.cc
    threadutils.cc
    thresholdadjuster.cc
    thresholdselector.cc