# HG changeset patch # User heinrichsweikamp # Date 1575273407 0 # Node ID cad6f8dfacabc7558320046cd226be7888521392 # Parent 0dbb74be972f9b4c699ad0caab1eb03163332110# Parent ebc2b571a0b98ece6fdac3b09995f01660dcf2ab Merged in janlmulder/ostc4/maintain-1 (pull request #35) Repo maintenace diff -r 0dbb74be972f -r cad6f8dfacab .hgtags --- 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 diff -r 0dbb74be972f -r cad6f8dfacab Discovery/Src/settings.c --- 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; diff -r 0dbb74be972f -r cad6f8dfacab Discovery/Src/tMenuEditSystem.c --- a/Discovery/Src/tMenuEditSystem.c Sun Nov 24 15:46:58 2019 +0000 +++ b/Discovery/Src/tMenuEditSystem.c Mon Dec 02 07:56:47 2019 +0000 @@ -38,7 +38,7 @@ #include "tMenu.h" #include "tMenuEdit.h" #include "tMenuSystem.h" -#include "Motion.h" +#include "motion.h" #include "t7.h"