Commit Graph

152 Commits

Author SHA1 Message Date
Robin Müller 1898b4f2db Merge remote-tracking branch 'upstream/development' into update-from-upstream 2022-09-16 11:06:05 +02:00
Robin Müller 1a833e2d45
another missing changelog entry 2022-09-15 10:59:10 +02:00
Robin Müller 8df6d934d7
another missing changelog entry 2022-09-15 10:56:52 +02:00
Robin Müller 5363868120
added another missing changelog entry 2022-09-15 10:54:45 +02:00
Robin Müller 9a181aa6a8
another missing changelog entry 2022-09-15 10:47:50 +02:00
Robin Müller 655c944c0e
another missing changelog entry 2022-09-15 10:45:35 +02:00
Robin Müller 2e310fca8d
add another missing changelog entry 2022-09-15 10:43:45 +02:00
Robin Müller 37390dfc74
add missing changelog entry 2022-09-15 10:42:35 +02:00
Robin Müller eedf57624f
Merge remote-tracking branch 'upstream/mueller/dhb-handle-device-tm' into develop 2022-08-30 15:40:52 +02:00
Robin Müller d4ed528426
Merge remote-tracking branch 'upstream/mueller/data-wrapper' into mueller/data-wrapper-update 2022-08-30 14:52:09 +02:00
Robin Müller e10e71cee9
Merge branch 'mueller/data-wrapper' into mueller/dhb-handle-device-tm 2022-08-30 14:42:13 +02:00
Robin Müller d675a789a2
update changelog 2022-08-30 14:41:37 +02:00
Robin Müller 6b8c83be29
update changelog 2022-08-30 14:40:02 +02:00
Robin Müller 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
Robin Müller a46d8c34d9
small changelog update 2022-08-22 16:37:53 +02:00
Robin Müller 10f34e5a48
Merge remote-tracking branch 'origin/development' into mueller/refactor-tmtc-stack-with-retval-refactoring 2022-08-22 15:57:22 +02:00
Robin Müller 2a4ab0af7b
Merge branch 'mueller/refactor-tmtc-stack' into mueller/refactor-tmtc-stack-with-retval-refactoring 2022-08-22 14:17:24 +02:00
Robin Müller e3648b6e30 Merge remote-tracking branch 'upstream/mueller/refactor-tmtc-stack' into mueller/tmtc-stack-refactoring 2022-08-16 17:25:22 +02:00
Robin Müller 239d053562
update changelog 2022-08-16 17:23:10 +02:00
Ulrich Mohr f63f3fa564 more occurences in comments 2022-08-16 12:12:21 +02:00
Robin Müller 1037102349
merge retval refactoring 2022-08-16 01:08:26 +02:00
Robin Müller 221361eb9c
Merge remote-tracking branch 'origin/development' into mueller/expand-retval-if 2022-08-15 20:32:38 +02:00
Robin Müller 4224c3d009
bump changelog 2022-08-15 20:29:23 +02:00
Robin Müller c57e95c698 Merge remote-tracking branch 'upstream/mueller/refactor-tmtc-stack' into mueller/tmtc-stack-refactoring 2022-08-15 19:18:46 +02:00
Robin Müller 9d64b96e9a
update changelog 2022-08-15 15:02:39 +02:00
Robin Müller 8970a7379a
Merge remote-tracking branch 'upstream/development' into mueller/update-from-upstream 2022-08-12 12:21:50 +02:00
Robin Müller 05d4162f5b Merge branch 'development' into v5.0.0 2022-07-25 14:35:36 +02:00
Robin Müller e030878023
changelog 2022-07-25 14:33:10 +02:00
Robin Müller 9bbe1dc716 Merge branch 'development' into mueller/possible-ring-buffer-fix 2022-07-21 13:23:44 +02:00
Robin Müller 6f751c2cf9 Merge branch 'development' into v5.0.0 2022-07-18 15:12:21 +02:00
Robin Müller 91067cde98
typo 2022-07-18 15:00:40 +02:00
Robin Müller 428018e4f1 update changelog 2022-07-18 14:59:25 +02:00
Robin Müller 8b6dd3f868
add date to changelog 2022-07-18 14:49:27 +02:00
Robin Müller 4da18172b3 Merge branch 'development' into mueller/possible-ring-buffer-fix 2022-07-18 14:37:56 +02:00
Ulrich Mohr 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
Robin Müller 0e49640306
update CHANGELOG 2022-07-08 17:59:43 +02:00
Robin Müller 0519083894
remove duplicate entries 2022-07-08 17:48:06 +02:00
Robin Müller a4247cd723
Merge remote-tracking branch 'upstream/development' into mueller/update-from-upstream 2022-07-04 10:53:52 +02:00
Robin Müller 2ebefdffae
Merge remote-tracking branch 'upstream/development' into mueller/possible-ring-buffer-fix 2022-06-21 10:49:03 +02:00
Steffen Gaisser 732b615cb3 Merge branch 'development' into mueller/new-cicd-cmake-opts 2022-06-20 16:34:13 +02:00
Robin Müller d47a908117 Merge branch 'development' into mueller/task-if-refactoring 2022-06-20 09:40:31 +02:00
Robin Müller a3c0b441ec update changelog 2022-06-08 12:12:33 +02:00
Robin Müller 3f9e459f48 update changelog 2022-06-08 12:12:09 +02:00
Robin Müller 98b711a872 update changelog 2022-06-08 12:12:09 +02:00
Robin Müller 4b323053ec
Merge remote-tracking branch 'upstream/development' into mueller/update-from-upstream 2022-05-16 15:27:58 +02:00
Robin Müller d871f55a89
Merge remote-tracking branch 'upstream/development' into mueller/possible-ring-buffer-fix 2022-05-16 15:13:47 +02:00
Robin Müller 816550b69c Merge remote-tracking branch 'upstream/development' into mueller/new-cicd-cmake-opts 2022-05-16 14:58:25 +02:00
Robin Müller ef9d7aa7d3 Merge branch 'development' into mueller/extend-version-class 2022-05-16 14:42:23 +02:00
Robin Müller 8a12a5097e
Merge branch 'mueller/apply-afmt' into mueller/new-cicd-cmake-opts 2022-05-13 13:50:41 +02:00
Robin Müller 0375ee1881
update changelog 2022-05-13 13:46:54 +02:00