Merge pull request #807 from nasa/integration-candidate

IC: equuleus-rc1+dev20
nasa · Nov 5, 2024 · 6376290 · 6376290
2 parents 70b6460 + 14ed0fa
commit 6376290
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/cfe b/cfe
diff --git a/osal b/osal
diff --git a/tools/cFS-GroundSystem b/tools/cFS-GroundSystem
+4 −0		CHANGELOG.md
+1 −1		modules/core_api/fsw/inc/cfe_version.h
+1 −8		modules/es/fsw/src/cfe_es_cds.c
+1 −1		.github/pull_request_template.md
+4 −0		CHANGELOG.md
+1 −1		src/bsp/shared/inc/bsp-impl.h
+2 −2		src/bsp/shared/src/bsp_default_resourcecfg.c
+1 −1		src/os/inc/osapi-version.h
+1 −1		src/os/rtems/CMakeLists.txt
+1 −1		src/os/vxworks/inc/os-impl-dirs.h
+1 −1		ut_assert/src/utstubs.c