Merge pull request nasa#108 from nasa/integration-candidate

Integration Candidate: 2020-06-24
skliper · Jul 26, 2020 · b1f3e36 · b1f3e36
2 parents 18d0d89 + f41ae80
commit b1f3e36
Show file tree

Hide file tree

Showing 12 changed files with 12 additions and 12 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,3 @@
 Makefile
 build
-sample_defs
+/sample_defs
diff --git a/apps/ci_lab b/apps/ci_lab
diff --git a/apps/sample_app b/apps/sample_app
diff --git a/apps/sample_lib b/apps/sample_lib
diff --git a/apps/sch_lab b/apps/sch_lab
diff --git a/apps/to_lab b/apps/to_lab
diff --git a/cfe b/cfe
diff --git a/osal b/osal
diff --git a/psp b/psp
diff --git a/tools/cFS-GroundSystem b/tools/cFS-GroundSystem
diff --git a/tools/elf2cfetbl b/tools/elf2cfetbl
diff --git a/tools/tblCRCTool b/tools/tblCRCTool