Merge branch 'dev' into newlocallab

2020-02-08 11:23:54 +01:00
parent 8356fd44e3 fcbb9f55b6
commit 54fdc848f0
1 changed files with 1 additions and 1 deletions
--- a/rtgui/editorpanel.cc
+++ b/rtgui/editorpanel.cc
@@ -91,7 +91,7 @@ bool find_default_monitor_profile (GdkWindow *rootwin, Glib::ustring &defprof, G
        ReleaseDC (NULL, hDC);
    }

-#elif
+#else
    // taken from geeqie (image.c) and adapted
    // Originally licensed as GPL v2+, with the following copyright:
    // * Copyright (C) 2006 John Ellis