Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

O

ogs
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

b926a881

Unverified Commit b926a881 authored 5 years ago by Lars Bilke Committed by GitHub 5 years ago

Downloads
- Plain Diff

Merge pull request #2756 from bilke/bump-conan

Bump Conan to 1.21.0

parents be3f669c b36e6210

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

ThirdParty/container-maker 1 addition, 1 deletion

ThirdParty/container-maker
scripts/cmake/ConanSetup.cmake 1 addition, 1 deletion

scripts/cmake/ConanSetup.cmake
scripts/docker/Dockerfile.clang.full 16 additions, 18 deletions

scripts/docker/Dockerfile.clang.full
scripts/docker/Dockerfile.gcc.full 16 additions, 18 deletions

scripts/docker/Dockerfile.gcc.full
scripts/docker/Dockerfile.gcc.gui 16 additions, 18 deletions

scripts/docker/Dockerfile.gcc.gui

with 50 additions and 56 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