diff options
| author | Olivier Goffart <ogoffart@woboq.com> | 2019-02-08 14:48:31 +0300 |
|---|---|---|
| committer | Olivier Goffart <ogoffart@woboq.com> | 2019-02-08 14:48:31 +0300 |
| commit | 597acba2741a2d3ca8a7c0ddde47b484f0df374d (patch) | |
| tree | a53c670925ebda93057d1c3530ad542ac4c579c4 /VERSION.cmake | |
| parent | c8ce40d5830dace6c33c2045ac3ef30ca1c3b3b1 (diff) | |
| parent | 0b8d591d2999b5d9915a65362127eecde25a1979 (diff) | |
Merge remote-tracking branch 'origin/2.5'
Conflicts:
VERSION.cmake
src/common/syncjournaldb.cpp
src/libsync/propagatedownload.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 61adf735e..553a0f6ab 100644 --- a/VERSION.cmake +++ b/VERSION.cmake @@ -1,7 +1,7 @@ set( MIRALL_VERSION_MAJOR 2 ) set( MIRALL_VERSION_MINOR 6 ) set( MIRALL_VERSION_PATCH 0 ) -set( MIRALL_VERSION_YEAR 2018 ) +set( MIRALL_VERSION_YEAR 2019 ) set( MIRALL_SOVERSION 0 ) if ( NOT DEFINED MIRALL_VERSION_SUFFIX ) |