Mercurial > public > ostc4
comparison Discovery/Src/tMenuDecoParameter.c @ 352:1f24022345d1 fix-merge-mess
Fix merge problem
The merge in changeset 352 is simply wrong, so revert all changes
made in that merge.
Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
| author | Jan Mulder <jlmulder@xs4all.nl> |
|---|---|
| date | Tue, 08 Oct 2019 16:35:45 +0200 |
| parents | 5f11787b4f42 |
| children | d4622533271d |
comparison
equal
deleted
inserted
replaced
| 351:ba53ab77f059 | 352:1f24022345d1 |
|---|