Skip to content

Commit

Permalink
Merge pull request #620 from nasa/integration-candidate
Browse files Browse the repository at this point in the history 
IC: Caelum-rc4+dev30
  • Loading branch information
@dzbaker
dzbaker authored Nov 28, 2022
2 parents 1df262a + 0375c0f commit 1b0b338
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 13 files
+1 −1 .github/workflows/code-coverage.yml
+2 −2 .github/workflows/functional-tests.yml
+7 −0 CHANGELOG.md
+0 −1 cmake/sample_defs/arch_build_custom.cmake
+11 −0 cmake/sample_defs/arch_build_custom_native.cmake
+2 −0 cmake/sample_defs/targets.cmake
+0 −2 cmake/sample_defs/toolchain-arm-cortexa8_neon-linux-gnueabi.cmake
+0 −25 cmake/sample_defs/toolchain-cpu3.cmake
+2 −4 cmake/sample_defs/toolchain-i686-linux-clang.cmake
+0 −2 cmake/sample_defs/toolchain-i686-linux-gnu.cmake
+0 −2 cmake/sample_defs/toolchain-powerpc-440_softfp-linux-gnu.cmake
+2 −1 cmake/target/CMakeLists.txt
+1 −1 modules/core_api/fsw/inc/cfe_version.h
2 changes: 1 addition & 1 deletion libs/sample_lib
Submodule sample_lib updated 4 files
+4 −0 CHANGELOG.md
+ − fsw/src/.sample_lib.c.swp
+1 −1 fsw/src/sample_lib.c
+1 −1 fsw/src/sample_lib_version.h
2 changes: 1 addition & 1 deletion osal
Submodule osal updated 4 files
+2 −2 .github/workflows/build-osal-documentation.yml
+1 −1 .github/workflows/local_unit_test.yml
+4 −0 CHANGELOG.md
+1 −1 src/os/inc/osapi-version.h

0 comments on commit 1b0b338

Please sign in to comment.