Merge branch 'main' into feature/update-versions

philips-software · May 30, 2024 · 0e5f810 · 0e5f810
2 parents 196a127 + 85d9091
commit 0e5f810
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.devcontainer/cpp/Dockerfile b/.devcontainer/cpp/Dockerfile
@@ -4,7 +4,7 @@ ARG BATS_VERSION=1.11.0
 ARG CCACHE_VERSION=4.9.1
 ARG CLANG_VERSION=17
 ARG DOCKER_VERSION=26.1.3
-ARG MULL_VERSION=main
+ARG MULL_VERSION=0.22.0
 ARG INCLUDE_WHAT_YOU_USE_VERSION=0.21
 ARG XWIN_VERSION=0.5.2
 

diff --git a/.devcontainer/cpp/apt-requirements-base.json b/.devcontainer/cpp/apt-requirements-base.json
@@ -2,7 +2,7 @@
   "ca-certificates": "20240203",
   "g++-13": "13.2.0-23ubuntu4",
   "gdb-multiarch": "15.0.50.20240403-0ubuntu1",
-  "git": "1:2.43.0-1ubuntu7",
+  "git": "1:2.43.0-1ubuntu7.1",
   "gnupg2": "2.4.4-2ubuntu17",
   "ninja-build": "1.11.1-2",
   "python3-pip": "24.0+dfsg-1ubuntu1",