Skip to content

Commit

Permalink
Merge pull request #732 from nasa/integration-candidate
Browse files Browse the repository at this point in the history 
IC: equuleus-rc1+dev2
  • Loading branch information
@dzbaker
dzbaker committed Jan 18, 2024
2 parents 4dcdc4b + a4b2590 commit f16acb2
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion apps/ci_lab
Submodule ci_lab updated 8 files
+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
2 changes: 1 addition & 1 deletion cfe
Submodule cfe updated 3 files
+4 −0 CHANGELOG.md
+5 −2 cmake/global_functions.cmake
+1 −1 modules/core_api/fsw/inc/cfe_version.h
2 changes: 1 addition & 1 deletion osal
Submodule osal updated 3 files
+4 −0 CHANGELOG.md
+1 −1 src/os/inc/osapi-version.h
+1 −1 src/os/shared/src/osapi-errors.c

0 comments on commit f16acb2

Please sign in to comment.