Merge with 'Beep6581/dev'

2023-09-05 09:48:43 +02:00
parent d8c0b521ab 7c73da7723
commit 990e9c70a5
91 changed files with 1524 additions and 1157 deletions
--- a/rtgui/dirbrowser.h
+++ b/rtgui/dirbrowser.h
@@ -69,7 +69,7 @@ private:

    bool expandSuccess;

-#ifdef WIN32
+#ifdef _WIN32
    unsigned int volumes;
 public:
    void updateVolumes ();