Skip to content

Commit

Permalink
IC: Caelum-rc4+dev47
Browse files Browse the repository at this point in the history 
*Combines:*

cFE v7.0.0-rc4+dev276
osal v6.0.0-rc4+dev213
PSP v1.6.0-rc4+dev76

**Includes:**

*cFE*
- nasa/cFE#2299
- nasa/cFE#2300
- nasa/cFE#2298

*osal*
- nasa/osal#1383

*PSP*
- nasa/PSP#391

Co-authored by: Joseph Hickey <jphickey@users.noreply.github.com>
Co-authored by: Dylan Z. Baker <dzbaker@users.noreply.github.com>
  • Loading branch information
@dzbaker
dzbaker committed Apr 25, 2023
1 parent ac527cb commit b472c6a
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion cfe
Submodule cfe updated 11 files
+74 −0 .github/workflows/icbundle.yml
+6 −0 CHANGELOG.md
+172 −83 cmake/arch_build.cmake
+0 −49 cmake/generate_table.cmake
+15 −8 cmake/global_functions.cmake
+41 −1 cmake/mission_build.cmake
+5 −0 cmake/tables/elf2cfetbl_rules.mk
+34 −0 cmake/tables/generate_elf_table_rules.cmake
+10 −0 cmake/tables/table_rule_template.d.in
+10 −0 cmake/tables/tabletool_rule.mk
+1 −1 modules/core_api/fsw/inc/cfe_version.h
2 changes: 1 addition & 1 deletion osal
Submodule osal updated 3 files
+74 −0 .github/workflows/icbundle.yml
+4 −0 CHANGELOG.md
+1 −1 src/os/inc/osapi-version.h
2 changes: 1 addition & 1 deletion psp
Submodule psp updated 5 files
+79 −0 .github/workflows/icbundle.yml
+4 −0 CHANGELOG.md
+1 −1 fsw/mcp750-vxworks/inc/psp_version.h
+1 −1 fsw/pc-linux/inc/psp_version.h
+1 −1 fsw/pc-rtems/inc/psp_version.h

0 comments on commit b472c6a

Please sign in to comment.