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 /VERSION.cmake | |
| 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 'VERSION.cmake')
| -rw-r--r-- | VERSION.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/VERSION.cmake b/VERSION.cmake index 8f780835c..f512e0bd6 100644 --- a/VERSION.cmake +++ b/VERSION.cmake @@ -1,7 +1,7 @@ set( MIRALL_VERSION_MAJOR 2 ) set( MIRALL_VERSION_MINOR 7 ) set( MIRALL_VERSION_PATCH 0 ) -set( MIRALL_VERSION_YEAR 2019 ) +set( MIRALL_VERSION_YEAR 2020 ) set( MIRALL_SOVERSION 0 ) if ( NOT DEFINED MIRALL_VERSION_SUFFIX ) |