Merge branch 'master' into feature/opentv-update

This commit is contained in:
Adam Sutton 2012-06-26 14:18:21 +01:00
commit e9cd732805

View file

@ -9,6 +9,5 @@ const char *tvheadend_dataroot(void)
assert(getcwd(cwd, 254));
strcat(cwd, "/");
}
printf("cwd = %s\n", cwd);
return cwd;
}