From f570e2f2685aa43aa518c2f8578391c1847cddbe Mon Sep 17 00:00:00 2001 From: Daniel Wilhelm Date: Fri, 18 Apr 2014 17:04:59 +0200 Subject: 3.3 --- ui/gridView.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'ui/gridView.h') diff --git a/ui/gridView.h b/ui/gridView.h index 5ab28a44..eaa8ad8c 100644 --- a/ui/gridView.h +++ b/ui/gridView.h @@ -61,6 +61,7 @@ public: bool existsSyncDirLeft; bool existsSyncDirRight; bool existsSyncDirNone; + bool existsSyncEqual; bool existsConflict; unsigned int filesOnLeftView; @@ -81,6 +82,7 @@ public: bool syncDirOverwLeftActive, bool syncDirOverwRightActive, bool syncDirNoneActive, + bool syncEqualActive, bool conflictFilesActive); @@ -125,7 +127,7 @@ private: // | // | (update...) // \|/ - std::vector sortedRef; //equivalent to folerCmp, but may be sorted + std::vector sortedRef; //equivalent to folderCmp, but may be sorted // | // | (setData) // \|/ -- cgit