Skip to content

Docker build #7134

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DennisOSRM merged 3 commits into from
Mar 20, 2025
Merged

Docker build #7134

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eccd355
Squashed 'third_party/libosmium/' changes from d2c1d872b..cd892f98e
DennisOSRM Mar 20, 2025
063cc5e
Merge commit 'eccd355f4502a657da69cdc408e328368a521c13' into docker_b…
DennisOSRM Mar 20, 2025
5e991d9
Trigger CI
DennisOSRM Mar 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
63 changes: 0 additions & 63 deletions third_party/libosmium/appveyor.yml
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions third_party/libosmium/include/osmium/io/pbf.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,7 @@

This file is part of Osmium (https://osmcode.org/libosmium).

<<<<<<<< HEAD:third_party/libosmium/include/osmium/index/bool_vector.hpp
Copyright 2013-2022 Jochen Topf <jochen@topf.org> and others (see README).
========
Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).
>>>>>>>> 89b30b26e52b729191b9ed10d1c4ef08933d92ef:third_party/libosmium/include/osmium/io/pbf.hpp

Boost Software License - Version 1.0 - August 17th, 2003

Expand Down
2 changes: 1 addition & 1 deletion third_party/libosmium/include/osmium/tags/taglist.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

This file is part of Osmium (https://osmcode.org/libosmium).

Copyright 2013-2022 Jochen Topf <jochen@topf.org> and others (see README).
Copyright 2013-2023 Jochen Topf <jochen@topf.org> and others (see README).

Boost Software License - Version 1.0 - August 17th, 2003

Expand Down
Loading