Merge branch 'dev' into newlocallab

2020-02-07 21:34:38 +01:00
parent c984a95b9e 8f291c3ff2
commit b74d31525e
23 changed files with 2 additions and 66 deletions
--- a/rtgui/filecatalog.cc
+++ b/rtgui/filecatalog.cc
@@ -45,8 +45,6 @@

 using namespace std;

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