Conflicts:
	src/neutrino.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: af8c4b8d97
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-02-12 23:01:15 +01:00
35 changed files with 111 additions and 43 deletions

View File

@@ -2069,6 +2069,7 @@ static void print_meminfo(void)
static void *houseKeepingThread(void *)
{
int count = 0, scount = 0, ecount = 0;
set_threadname("sd:housekeeping");
dprintf("housekeeping-thread started.\n");
pthread_setcanceltype (PTHREAD_CANCEL_ASYNCHRONOUS, 0);