Merge pull request #93 from nasa/integration-candidate

sample_lib Integration candidate: Caelum-rc4+dev30
nasa · Nov 28, 2022 · 2dc2845 · 2dc2845
2 parents 2da1173 + 58a3d3f
commit 2dc2845
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## Development Build: v1.3.0-rc4+dev32
+- Add newline at end of sample_lib.c
+- See <https://github.com/nasa/sample_lib/pull/92>
+
 ## Development Build: v1.3.0-rc4+dev28
 - Remove redundant comments
 - Create CHANGELOG.md

diff --git a/fsw/src/.sample_lib.c.swp b/fsw/src/.sample_lib.c.swp
diff --git a/fsw/src/sample_lib.c b/fsw/src/sample_lib.c
@@ -76,4 +76,4 @@ int32 SAMPLE_LIB_Function(void)
     OS_printf("SAMPLE_LIB_Function called, buffer=\'%s\'\n", SAMPLE_LIB_Buffer);
 
     return CFE_SUCCESS;
-}
+}
diff --git a/fsw/src/sample_lib_version.h b/fsw/src/sample_lib_version.h
@@ -26,7 +26,7 @@
 
 /* Development Build Macro Definitions */
 
-#define SAMPLE_LIB_BUILD_NUMBER 28 /*!< Development Build: Number of commits since baseline */
+#define SAMPLE_LIB_BUILD_NUMBER 32 /*!< Development Build: Number of commits since baseline */
 #define SAMPLE_LIB_BUILD_BASELINE \
     "v1.3.0-rc4" /*!< Development Build: git tag that is the base for the current development */
-Original file line number
+Diff line change
@@ Expand Up / @@ -76,4 +76,4 @@ int32 SAMPLE_LIB_Function(void) @@
         OS_printf("SAMPLE_LIB_Function called, buffer=\'%s\'\n", SAMPLE_LIB_Buffer);
         return CFE_SUCCESS;
-    }
+    }