Skip to content

Commit 2dc2845

Browse files
authored
Merge pull request #93 from nasa/integration-candidate
sample_lib Integration candidate: Caelum-rc4+dev30
2 parents 2da1173 + 58a3d3f commit 2dc2845

4 files changed

Lines changed: 6 additions & 2 deletions

File tree

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# Changelog
22

3+
## Development Build: v1.3.0-rc4+dev32
4+
- Add newline at end of sample_lib.c
5+
- See <https://github.com/nasa/sample_lib/pull/92>
6+
37
## Development Build: v1.3.0-rc4+dev28
48
- Remove redundant comments
59
- Create CHANGELOG.md

fsw/src/.sample_lib.c.swp

-12 KB
Binary file not shown.

fsw/src/sample_lib.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,4 +76,4 @@ int32 SAMPLE_LIB_Function(void)
7676
OS_printf("SAMPLE_LIB_Function called, buffer=\'%s\'\n", SAMPLE_LIB_Buffer);
7777

7878
return CFE_SUCCESS;
79-
}
79+
}

fsw/src/sample_lib_version.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
/* Development Build Macro Definitions */
2828

29-
#define SAMPLE_LIB_BUILD_NUMBER 28 /*!< Development Build: Number of commits since baseline */
29+
#define SAMPLE_LIB_BUILD_NUMBER 32 /*!< Development Build: Number of commits since baseline */
3030
#define SAMPLE_LIB_BUILD_BASELINE \
3131
"v1.3.0-rc4" /*!< Development Build: git tag that is the base for the current development */
3232

0 commit comments

Comments
 (0)