Skip to content

Commit

Permalink
Merge pull request #638 from nasa/integration-candidate
Browse files Browse the repository at this point in the history 
IC: Caelum-rc4+dev34
  • Loading branch information
@dzbaker
dzbaker authored Jan 5, 2023
2 parents 4211eb5 + 0a7483a commit cfcaac4
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion osal
Submodule osal updated 9 files
+5 −0 CHANGELOG.md
+11 −0 default_config.cmake
+9 −0 osconfig.h.in
+0 −2 src/bsp/pc-rtems/src/bsp_start.c
+1 −1 src/os/inc/osapi-version.h
+0 −3 src/os/rtems/src/os-impl-loader.c
+0 −3 src/os/rtems/src/os-impl-no-module.c
+0 −2 src/os/rtems/src/os-impl-timebase.c
+3 −0 src/os/shared/src/osapi-task.c
2 changes: 1 addition & 1 deletion psp
Submodule psp updated 6 files
+5 −0 CHANGELOG.md
+1 −1 fsw/mcp750-vxworks/inc/psp_version.h
+1 −1 fsw/pc-linux/inc/psp_version.h
+5 −3 fsw/pc-linux/src/cfe_psp_memory.c
+1 −1 fsw/pc-rtems/inc/psp_version.h
+0 −1 fsw/pc-rtems/src/cfe_psp_start.c

0 comments on commit cfcaac4

Please sign in to comment.