Merge pull request #732 from nasa/integration-candidate

IC: equuleus-rc1+dev2
nasa · Jan 18, 2024 · f16acb2 · f16acb2
2 parents 4dcdc4b + a4b2590
commit f16acb2
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/apps/ci_lab b/apps/ci_lab
diff --git a/cfe b/cfe
diff --git a/osal b/osal
+5 −0		CHANGELOG.md
+4 −3		config/default_ci_lab_msgids.h
+4 −3		config/default_ci_lab_topicids.h
+1 −0		fsw/inc/ci_lab_eventids.h
+14 −3		fsw/src/ci_lab_app.c
+2 −0		fsw/src/ci_lab_app.h
+5 −0		fsw/src/ci_lab_dispatch.c
+16 −10		fsw/src/ci_lab_version.h
+4 −0		CHANGELOG.md
+5 −2		cmake/global_functions.cmake
+1 −1		modules/core_api/fsw/inc/cfe_version.h