Commit Graph

166 Commits

Author SHA1 Message Date
79ab0c4aa5 Merge branch 'mueller/smaller-tweaks' into develop 2022-09-16 18:24:39 +02:00
72172a972b update changelog 2022-09-16 18:24:23 +02:00
3d2fc28468 Merge remote-tracking branch 'upstream/mueller/new-cfdp-update-with-handlers' into cfdp-integration 2022-09-16 11:10:35 +02:00
1898b4f2db Merge remote-tracking branch 'upstream/development' into update-from-upstream 2022-09-16 11:06:05 +02:00
e585c1d84a Merge remote-tracking branch 'origin/development' into mueller/cfdp-update-without-handlers 2022-09-15 11:02:04 +02:00
1a833e2d45 another missing changelog entry 2022-09-15 10:59:10 +02:00
8df6d934d7 another missing changelog entry 2022-09-15 10:56:52 +02:00
5363868120 added another missing changelog entry 2022-09-15 10:54:45 +02:00
36cf59cc8e Merge branch 'mueller/refactor-accepts-tc-tm-if' into mueller/cfdp-update-without-handlers 2022-09-15 10:52:13 +02:00
97fec909f2 Merge branch 'mueller/local-pool-update' into mueller/cfdp-update-without-handlers 2022-09-15 10:50:35 +02:00
1db77753e3 Merge remote-tracking branch 'origin/development' into mueller/local-pool-update 2022-09-15 10:49:24 +02:00
8501477a78 Merge remote-tracking branch 'origin/development' into mueller/refactor-accepts-tc-tm-if 2022-09-15 10:48:42 +02:00
9a181aa6a8 another missing changelog entry 2022-09-15 10:47:50 +02:00
655c944c0e another missing changelog entry 2022-09-15 10:45:35 +02:00
2e310fca8d add another missing changelog entry 2022-09-15 10:43:45 +02:00
37390dfc74 add missing changelog entry 2022-09-15 10:42:35 +02:00
75ddfdc65d Merge branch 'mueller/refactor-accepts-tc-tm-if' into mueller/cfdp-update-without-handlers 2022-09-15 10:41:16 +02:00
1efc0d2855 update changelog 2022-09-15 10:38:40 +02:00
e063b44899 add link to PR 2022-09-15 10:32:38 +02:00
b3c0e24611 bump changelog 2022-09-15 10:31:55 +02:00
723f8749d4 bump changelog 2022-09-14 19:52:33 +02:00
73f1917c81 update changelog 2022-09-14 19:26:07 +02:00
eedf57624f Merge remote-tracking branch 'upstream/mueller/dhb-handle-device-tm' into develop 2022-08-30 15:40:52 +02:00
d4ed528426 Merge remote-tracking branch 'upstream/mueller/data-wrapper' into mueller/data-wrapper-update 2022-08-30 14:52:09 +02:00
e10e71cee9 Merge branch 'mueller/data-wrapper' into mueller/dhb-handle-device-tm 2022-08-30 14:42:13 +02:00
d675a789a2 update changelog 2022-08-30 14:41:37 +02:00
6b8c83be29 update changelog 2022-08-30 14:40:02 +02:00
f91ad84bdc Merge remote-tracking branch 'upstream/mueller/refactor-tmtc-stack' into mueller/refactor-tmtc-stack-retval-merged 2022-08-24 17:13:41 +02:00
a46d8c34d9 small changelog update 2022-08-22 16:37:53 +02:00
10f34e5a48 Merge remote-tracking branch 'origin/development' into mueller/refactor-tmtc-stack-with-retval-refactoring 2022-08-22 15:57:22 +02:00
2a4ab0af7b Merge branch 'mueller/refactor-tmtc-stack' into mueller/refactor-tmtc-stack-with-retval-refactoring 2022-08-22 14:17:24 +02:00
e3648b6e30 Merge remote-tracking branch 'upstream/mueller/refactor-tmtc-stack' into mueller/tmtc-stack-refactoring 2022-08-16 17:25:22 +02:00
239d053562 update changelog 2022-08-16 17:23:10 +02:00
f63f3fa564 more occurences in comments 2022-08-16 12:12:21 +02:00
1037102349 merge retval refactoring 2022-08-16 01:08:26 +02:00
221361eb9c Merge remote-tracking branch 'origin/development' into mueller/expand-retval-if 2022-08-15 20:32:38 +02:00
4224c3d009 bump changelog 2022-08-15 20:29:23 +02:00
c57e95c698 Merge remote-tracking branch 'upstream/mueller/refactor-tmtc-stack' into mueller/tmtc-stack-refactoring 2022-08-15 19:18:46 +02:00
9d64b96e9a update changelog 2022-08-15 15:02:39 +02:00
8970a7379a Merge remote-tracking branch 'upstream/development' into mueller/update-from-upstream 2022-08-12 12:21:50 +02:00
05d4162f5b Merge branch 'development' into v5.0.0 2022-07-25 14:35:36 +02:00
e030878023 changelog 2022-07-25 14:33:10 +02:00
9bbe1dc716 Merge branch 'development' into mueller/possible-ring-buffer-fix 2022-07-21 13:23:44 +02:00
6f751c2cf9 Merge branch 'development' into v5.0.0 2022-07-18 15:12:21 +02:00
91067cde98 typo 2022-07-18 15:00:40 +02:00
428018e4f1 update changelog 2022-07-18 14:59:25 +02:00
8b6dd3f868 add date to changelog 2022-07-18 14:49:27 +02:00
4da18172b3 Merge branch 'development' into mueller/possible-ring-buffer-fix 2022-07-18 14:37:56 +02:00
2e42f53682 Merge pull request 'New PoolEntry constructor' (#651) from eive/fsfw:mueller/new-pool-entry-ctor into development
Reviewed-on: fsfw/fsfw#651
2022-07-13 17:43:56 +02:00
0e49640306 update CHANGELOG 2022-07-08 17:59:43 +02:00