Merge remote-tracking branch 'upstream/master' into envscreen

This commit is contained in:
Michael Klein
2016-01-06 22:39:57 +01:00
19 changed files with 485 additions and 127 deletions

View File

@ -15,7 +15,7 @@ void CRT_handleSIGSEGV(int sgn) {
CRT_done();
fprintf(stderr, "\n\nhtop " VERSION " aborting.\n");
fprintf(stderr, "\nUnfortunately, you seem to be using an unsupported platform!");
fprintf(stderr, "\nPlease contact your platform package mantainer!\n\n");
fprintf(stderr, "\nPlease contact your platform package maintainer!\n\n");
abort();
}