Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

C

caosdb-cpplib
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Iterations
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

39a840d7

Commit 39a840d7 authored 8 months ago by Joscha Schmiedt

Downloads
- Plain Diff

Merge branch 'dev' into f-34-building-shared-libraries-on-windows-fails

parents 66bca40f 07e88302

No related branches found

No related tags found

Loading

Checking pipeline status

Changes 11
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

.docker/Dockerfile 2 additions, 1 deletion

.docker/Dockerfile
.gitignore 3 additions, 0 deletions

.gitignore
.gitlab-ci.yml 11 additions, 0 deletions

.gitlab-ci.yml
.gitmodules 3 additions, 0 deletions

.gitmodules
CMakeLists.txt 17 additions, 31 deletions

CMakeLists.txt
Makefile 11 additions, 0 deletions

Makefile
doc/CHANGELOG.md 2 additions, 1 deletion

doc/CHANGELOG.md
doc/Install_develop.rst 43 additions, 6 deletions

doc/Install_develop.rst
src/caosdb/configuration.cpp 2 additions, 2 deletions

src/caosdb/configuration.cpp
vcpkg 1 addition, 0 deletions

vcpkg
vcpkg.json 20 additions, 0 deletions

vcpkg.json

with 115 additions and 41 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment