Merge pull request #91 from nasa/integration-candidate

Integration Candidate: 2020-05-20
nasa · May 29, 2020 · d80daf5 · d80daf5
2 parents c9a1ade + 2dcaa61
commit d80daf5
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 9 deletions.
diff --git a/.clang-format b/.clang-format
@@ -11,7 +11,7 @@ AlignTrailingComments: true
 AllowAllParametersOfDeclarationOnNextLine: true
 AllowShortBlocksOnASingleLine: Empty
 AllowShortCaseLabelsOnASingleLine: false
-AllowShortFunctionsOnASingleLine: All
+AllowShortFunctionsOnASingleLine: Empty
 AllowShortIfStatementsOnASingleLine: false
 AllowShortLoopsOnASingleLine: false
 AlwaysBreakAfterReturnType: None

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/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