diff options
| author | Christian Kamm <mail@ckamm.de> | 2016-11-22 15:09:56 +0300 |
|---|---|---|
| committer | Christian Kamm <mail@ckamm.de> | 2016-11-23 18:47:56 +0300 |
| commit | 3e59a9b31600270b7c037c3b6149a51292626b3b (patch) | |
| tree | 27c9e56492757576f43b584dca1790b435dbcb99 /src/gui/folderwatcher_linux.cpp | |
| parent | 16e28567a63bf3ca9ac44de0e35833bb0db5c93e (diff) | |
| parent | 4998303c424d8ea050da30d2dd426a2472c8301b (diff) | |
Merge branch 'master' into dbjournal_per_account
Diffstat (limited to 'src/gui/folderwatcher_linux.cpp')
| -rw-r--r-- | src/gui/folderwatcher_linux.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gui/folderwatcher_linux.cpp b/src/gui/folderwatcher_linux.cpp index 72dde4a8d..ed935888e 100644 --- a/src/gui/folderwatcher_linux.cpp +++ b/src/gui/folderwatcher_linux.cpp @@ -3,7 +3,8 @@ * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 2 of the License. + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY |