Mercurial > public > ostc4
comparison Common/Inc/global_constants.h @ 354:5f46ec49f9bf
Merged in janlmulder/ostc4/fix-merge-mess (pull request #33)
Fix merge mess, and add tag
| author | heinrichsweikamp <bitbucket@heinrichsweikamp.com> |
|---|---|
| date | Wed, 09 Oct 2019 07:08:43 +0000 |
| parents | a6c0375bc950 |
| children | 9660df857c57 |
comparison
equal
deleted
inserted
replaced
| 351:ba53ab77f059 | 354:5f46ec49f9bf |
|---|