Merge branch 'dev' into issue1474

2020-02-23 11:24:56 +01:00
parent 7238db4d70 17767ce0aa
commit fe09f8587d
187 changed files with 6559 additions and 5953 deletions
--- a/rtgui/filecatalog.cc
+++ b/rtgui/filecatalog.cc
@@ -46,8 +46,6 @@

 using namespace std;

-#define CHECKTIME 2000
-
 FileCatalog::FileCatalog (CoarsePanel* cp, ToolBar* tb, FilePanel* filepanel) :
    filepanel(filepanel),
    selectedDirectoryId(1),