Merge pull request #654 from nasa/integration-candidate

IC: Caelum-rc4+dev40
nasa · Feb 27, 2023 · adc79b5 · adc79b5
2 parents e5460fc + 967bb7d
commit adc79b5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/osal b/osal
diff --git a/tools/tblCRCTool b/tools/tblCRCTool
+4 −0		CHANGELOG.md
+1 −1		src/os/inc/osapi-version.h
+1 −2		src/os/shared/src/osapi-idmap.c
+5 −1		CHANGELOG.md
+5 −5		cfe_ts_crc.c
+1 −1		cfe_ts_crc_version.h