Merge branch 'master' into enhancement/editableAndAliasExpression

MerginMaps · Oct 30, 2024 · 404ac2b · 404ac2b · inputapp-bot · Oct 30, 2024
2 parents 449f12e + 68a245a
commit 404ac2b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/.zenodo.json b/.zenodo.json
@@ -2,7 +2,7 @@
     "description": "<p>Mergin Maps mobile app is a QGIS powered app for Android and iOS devices.</p>", 
     "license": "GPLv3", 
     "title": "Mergin Maps mobile app", 
-    "version": "2024.5.1",
+    "version": "2024.6.0",
     "upload_type": "software", 
     "publication_date": "2022-02-24", 
     "creators": [
@@ -39,7 +39,7 @@
     "related_identifiers": [
         {
             "scheme": "url", 
-            "identifier": "https://github.com/MerginMaps/mobile/tree/2024.5.1", 
+            "identifier": "https://github.com/MerginMaps/mobile/tree/2024.6.0", 
             "relation": "isSupplementTo"
         }, 
         {

diff --git a/CITATION.cff b/CITATION.cff
@@ -1,4 +1,4 @@
-cff-version: 2024.5.1
+cff-version: 2024.6.0
 message: "If you use this software, please cite it as below."
 authors:
 - family-names: "Martin"

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -6,8 +6,8 @@ cmake_minimum_required(VERSION 3.22)
 
 # TODO automatically change with the scripts/update version script
 set(MM_VERSION_MAJOR "2024")
-set(MM_VERSION_MINOR "5")
-set(MM_VERSION_PATCH "1")
+set(MM_VERSION_MINOR "6")
+set(MM_VERSION_PATCH "0")
 set(QT_VERSION_DEFAULT "6.6.3")
 
 # Note: we cannot set this for non-android build, since CMake will start looking for