Merge branch 'f-consolidation' into 'dev'
F consolidation See merge request !12
No related branches found
No related tags found
Checking pipeline status
Showing
- .clang-format 1 addition, 1 deletion.clang-format
- .gitlab-ci.yml 8 additions, 2 deletions.gitlab-ci.yml
- CHANGELOG.md 3 additions, 1 deletionCHANGELOG.md
- CMakeLists.txt 2 additions, 2 deletionsCMakeLists.txt
- README_SETUP.md 1 addition, 140 deletionsREADME_SETUP.md
- README_SETUP.md 1 addition, 140 deletionsREADME_SETUP.md
- conanfile.py 1 addition, 1 deletionconanfile.py
- doc/CMakeLists.txt 12 additions, 2 deletionsdoc/CMakeLists.txt
- doc/Examples.rst 237 additions, 0 deletionsdoc/Examples.rst
- doc/README_SETUP.md 142 additions, 0 deletionsdoc/README_SETUP.md
- doc/conf.py.in 2 additions, 1 deletiondoc/conf.py.in
- doc/index.rst.in 2 additions, 2 deletionsdoc/index.rst.in
- doc/requirements.txt 1 addition, 0 deletionsdoc/requirements.txt
- include/CMakeLists.txt 2 additions, 0 deletionsinclude/CMakeLists.txt
- include/caosdb/authentication.h 3 additions, 6 deletionsinclude/caosdb/authentication.h
- include/caosdb/configuration.h 15 additions, 29 deletionsinclude/caosdb/configuration.h
- include/caosdb/connection.h 5 additions, 11 deletionsinclude/caosdb/connection.h
- include/caosdb/data_type.h 227 additions, 0 deletionsinclude/caosdb/data_type.h
- include/caosdb/entity.h 158 additions, 110 deletionsinclude/caosdb/entity.h
- include/caosdb/exceptions.h 1 addition, 2 deletionsinclude/caosdb/exceptions.h
Loading
Please register or sign in to comment