Mercurial > public > ostc4
changeset 390:cad6f8dfacab
Merged in janlmulder/ostc4/maintain-1 (pull request #35)
Repo maintenace
author | heinrichsweikamp <bitbucket@heinrichsweikamp.com> |
---|---|
date | Mon, 02 Dec 2019 07:56:47 +0000 |
parents | 0dbb74be972f (current diff) ebc2b571a0b9 (diff) |
children | 4151fddb1e34 44cb4e858643 |
files | |
diffstat | 3 files changed, 3 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Sun Nov 24 15:46:58 2019 +0000 +++ b/.hgtags Mon Dec 02 07:56:47 2019 +0000 @@ -1,3 +1,4 @@ 1b9be6040d8279117c7fc99d528790611638f10b V1.4.7 release ba9d99a2e310da601a948ff11ad665260c600e18 v1.4.8 release 143fe85f82a2e2aca50eb0c29bc55066cb4fe497 v1.5.0 release +afa55a50cc724b11b959fa81567d59ede251ef22 v1.5.1 release
--- a/Discovery/Src/settings.c Sun Nov 24 15:46:58 2019 +0000 +++ b/Discovery/Src/settings.c Mon Dec 02 07:56:47 2019 +0000 @@ -32,7 +32,7 @@ #include "externLogbookFlash.h" // for SAMPLESTART and SAMPLESTOP #include "text_multilanguage.h" // for LANGUAGE_END #include "tHome.h" // for CVIEW_END -#include "Motion.h" +#include "motion.h" SSettings Settings;