Skip to content

Commit 224f143

Browse files
authored
Merge branch 'main' into FEAT-implement-get-3d-meshes
2 parents 24e435c + 8b4cfe3 commit 224f143

File tree

9 files changed

+3164
-368
lines changed

9 files changed

+3164
-368
lines changed

etc/docker/base-images/Dockerfile.ubuntu.jammy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,4 +44,4 @@ RUN apt-get -y --no-install-recommends install -t llvm-toolchain-jammy-15 \
4444
clang-tidy-15 \
4545
clang-format
4646

47-
RUN apt-get -y install cmake
47+
RUN apt-get -y install cmake=3.25.2-0kitware1ubuntu22.04.1 cmake-data=3.25.2-0kitware1ubuntu22.04.1

src/viam/api/api_proto_tag.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v0.1.488
1+
v0.1.491

src/viam/api/app/mltraining/v1/ml_training.grpc.pb.cc

Lines changed: 42 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)