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

@@ -1355,7 +1355,7 @@ static int TelnetAcceptCB(int handle, void *userData)
/*------------------------------------------------------------------------------------*/
static void NREADlog(int level, char *txt, void *userData)
{
traceSys("anet",txt);
traceSys("anet","%s",txt);
SICSLogWrite(txt, (level == ANETERROR) ? eLogError : eLog);
}