Merge branch 'master' into next

This commit is contained in:
Michael Stapelberg 2012-09-20 10:56:58 +02:00
commit 485b49bbe3
2 changed files with 2 additions and 2 deletions

View File

@ -18,4 +18,4 @@ libi3.a: $(libi3_OBJECTS)
clean-libi3:
echo "[libi3] Clean"
rm -f $(libi3_OBJECTS) libi3/libi3.a
rm -f $(libi3_OBJECTS) libi3/libi3.a libi3.a

View File

@ -117,7 +117,7 @@ static int backtrace(void) {
DLOG("GDB did not run properly\n");
return -1;
} else if (stat(filename, &bt) == -1) {
DLOG("GDB executed succesfully, but no backtrace was generated\n");
DLOG("GDB executed successfully, but no backtrace was generated\n");
return -1;
}
return 1;