Skip to content
Snippets Groups Projects
Verified Commit 6583f355 authored by Timm Fitschen's avatar Timm Fitschen
Browse files

Merge branch 'f-move-entity' of gitlab.indiscale.com:caosdb/src/caosdb-cpplib into f-move-entity

parents d6f573ff 69c2497d
Branches
Tags
1 merge request!27F move entity
Pipeline #14459 passed
Stage: info
Stage: setup
Stage: test
Stage: deploy
Pipeline: caosdb-cppinttest

#14473

    Hide whitespace changes
    Inline Side-by-side
    CMakeLists.txt
    + 1
    − 1
    View file @ 6583f355
    ...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
    cmake_minimum_required(VERSION 3.13) cmake_minimum_required(VERSION 3.13)
    set(libcaosdb_VERSION 0.0.19) set(libcaosdb_VERSION 0.0.20)
    set(libcaosdb_COMPATIBLE_SERVER_VERSION_MAJOR 0) set(libcaosdb_COMPATIBLE_SERVER_VERSION_MAJOR 0)
    set(libcaosdb_COMPATIBLE_SERVER_VERSION_MINOR 5) set(libcaosdb_COMPATIBLE_SERVER_VERSION_MINOR 5)
    set(libcaosdb_COMPATIBLE_SERVER_VERSION_PATCH 0) set(libcaosdb_COMPATIBLE_SERVER_VERSION_PATCH 0)
    ......
    conanfile.py
    + 1
    − 1
    View file @ 6583f355
    ...@@ -3,7 +3,7 @@ from conans import ConanFile, CMake, tools ...@@ -3,7 +3,7 @@ from conans import ConanFile, CMake, tools
    class CaosdbConan(ConanFile): class CaosdbConan(ConanFile):
    name = "caosdb" name = "caosdb"
    version = "0.0.19" version = "0.0.20"
    license = "AGPL-3.0-or-later" license = "AGPL-3.0-or-later"
    author = "Timm C. Fitschen <t.fitschen@indiscale.com>" author = "Timm C. Fitschen <t.fitschen@indiscale.com>"
    url = "https://gitlab.indiscale.com/caosdb/src/caosdb-cpplib.git" url = "https://gitlab.indiscale.com/caosdb/src/caosdb-cpplib.git"
    ......
    0% or .
    You are about to add 0 people to the discussion. Proceed with caution.
    Please register or to comment