 Robin Müller
|
d975958120
|
Merge remote-tracking branch 'upstream/development' into develop
|
2022-08-16 11:26:59 +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 |
|
Robin Müller
|
2708b71d77
|
Merge remote-tracking branch 'origin/development' into mueller/new-cicd-cmake-opts
|
2022-05-13 12:00:40 +02:00 |
|
Robin Müller
|
13a34cd677
|
Merge remote-tracking branch 'upstream/development' into mueller/add-tc-scheduler-pus-11
|
2022-05-13 11:58:41 +02:00 |
|
Robin Müller
|
ff40a71582
|
Merge remote-tracking branch 'upstream/development' into mueller/possible-ring-buffer-fix
|
2022-05-13 11:30:32 +02:00 |
|
Robin Müller
|
271057ca6b
|
Merge remote-tracking branch 'upstream/development' into mueller/extend-version-class
|
2022-05-13 11:28:54 +02:00 |
|
Robin Müller
|
fc2b709148
|
resolve merge conflict
|
2022-05-12 20:48:50 +02:00 |
|
Robin Müller
|
02473a0cd7
|
Merge remote-tracking branch 'origin/develop' into mueller/health-if-extension-eive
|
2022-05-12 20:11:45 +02:00 |
|
Robin Müller
|
2e4b9bcd7c
|
Merge remote-tracking branch 'origin/development' into mueller/new-cicd-cmake-opts
|
2022-05-12 17:42:49 +02:00 |
|
Robin Müller
|
e77bde459b
|
Merge remote-tracking branch 'upstream/development' into mueller/extend-version-class
|
2022-05-12 17:12:26 +02:00 |
|
Robin Müller
|
c561271070
|
Merge branch 'development' into mueller/refactor-power-switch-if-etc
|
2022-05-12 17:09:27 +02:00 |
|
Robin Müller
|
e5c140e0ae
|
Merge branch 'development' into mueller/add-tc-scheduler-pus-11
|
2022-05-12 16:59:01 +02:00 |
|
Robin Müller
|
9a4c7589cc
|
Merge remote-tracking branch 'upstream/development' into mueller/add-tc-scheduler-pus-11
|
2022-05-12 15:52:47 +02:00 |
|
Robin Müller
|
e1604b292c
|
Merge branch 'development' into mueller/possible-ring-buffer-fix
|
2022-05-11 11:34:32 +02:00 |
|
Robin Müller
|
ab2d7ca98f
|
update changelog and docs
|
2022-05-11 11:29:28 +02:00 |
|
Robin Müller
|
5941c21adf
|
Merge remote-tracking branch 'origin/develop' into mueller/spi-speed-mode-getter
|
2022-05-11 10:58:13 +02:00 |
|
Robin Müller
|
0e880de0d0
|
update changelog
|
2022-05-11 10:54:39 +02:00 |
|
Steffen Gaisser
|
0410ecd9e3
|
Merge branch 'development' into mueller/add-lto-support
|
2022-05-10 11:51:39 +02:00 |
|
Robin Müller
|
b38329aa0e
|
Merge branch 'development' into mueller/extend-version-class
|
2022-05-10 11:19:48 +02:00 |
|
Robin Müller
|
0fe1b70bae
|
keep LTO option off by default
|
2022-05-10 11:19:29 +02:00 |
|
Robin Müller
|
c5b4499d98
|
Merge remote-tracking branch 'upstream/development' into mueller/refactor-power-switch-if-etc
|
2022-05-10 09:58:21 +02:00 |
|
Ulrich Mohr
|
4499c9bf04
|
Merge pull request 'Added new functions to add sequences and tables' (#606) from eive/fsfw:mueller/new-ss-adder-functions into development
Reviewed-on: fsfw/fsfw#606
|
2022-05-10 09:35:16 +02:00 |
|
Robin Müller
|
eb0223bc51
|
Merge branch 'development' into mueller/add-lto-support
|
2022-05-09 22:34:28 +02:00 |
|
Robin Müller
|
be6a492022
|
Merge branch 'development' into mueller/extend-version-class
|
2022-05-09 22:34:09 +02:00 |
|
Robin Müller
|
ece32f88f4
|
Merge remote-tracking branch 'origin/development' into mueller/tcp-server-bugfix
|
2022-05-09 16:14:17 +02:00 |