diff options
author | Olivier Goffart <ogoffart@woboq.com> | 2020-02-25 13:45:27 +0300 |
---|---|---|
committer | Olivier Goffart <ogoffart@woboq.com> | 2020-02-25 13:45:27 +0300 |
commit | dc1070d02d63f98a59425d02340ae8da6c9a9928 (patch) | |
tree | 7a8625591f3e71d0e62ea77ccc47061013a1abe6 /src/gui/MacOSXBundleInfo.plist | |
parent | a86b9677ca24ba67d7eed250c195b2dad3f8c9f9 (diff) | |
parent | aab8ee3e779adb60eebe4772995dbe7431f7f80e (diff) |
Merge remote-tracking branch 'origin/2.6'
Conflicts:
CHANGELOG.md
VERSION.cmake
src/gui/MacOSXBundleInfo.plist
src/gui/folderstatusmodel.h
src/gui/settingsdialog.cpp
Diffstat (limited to 'src/gui/MacOSXBundleInfo.plist')
-rw-r--r-- | src/gui/MacOSXBundleInfo.plist | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/MacOSXBundleInfo.plist b/src/gui/MacOSXBundleInfo.plist index d77481d0e..b37b55393 100644 --- a/src/gui/MacOSXBundleInfo.plist +++ b/src/gui/MacOSXBundleInfo.plist @@ -27,7 +27,7 @@ <key>CFBundleShortVersionString</key> <string>${MIRALL_VERSION_STRING}</string> <key>NSHumanReadableCopyright</key> - <string>(C) 2014-2019 ${APPLICATION_VENDOR}</string> + <string>(C) 2014-2020 ${APPLICATION_VENDOR}</string> <key>SUShowReleaseNotes</key> <false/> <key>SUPublicDSAKeyFile</key> |