Merge branch 'develop' of ssh://gitorious.psi.ch/sinqdev/sics into develop

Conflicts:
	fourmess.c
This commit is contained in:
2016-01-29 08:53:00 +01:00
50 changed files with 183 additions and 201 deletions

View File

@ -361,7 +361,7 @@ int DriveWrapper(SConnection * pCon, SicsInterp * pSics, void *pData,
ClearExecutor(GetExecutor());
return 0;
}
SCWrite(pCon, "Driving finished sucessfully", eValue);
SCWrite(pCon, "Driving finished successfully", eValue);
return 1;
}
@ -398,7 +398,7 @@ int RunWrapper(SConnection * pCon, SicsInterp * pSics, void *pData,
return 0;
}
/* interprete arguments as pairs name value and try to start */
/* interpret arguments as pairs name value and try to start */
for (i = 1; i < argc; i += 2) {
if (argv[i + 1] == NULL) {
snprintf(pBueffel,511, "ERROR: no value found for driving %s", argv[i]);