diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-07-01 02:12:43 +0000 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-07-01 02:12:43 +0000 |
| commit | 13ea39a34766fcbecd96ab94bcdf798b08e9bb60 (patch) | |
| tree | 1e1463b03838a6f36868a4dafc7e652358a51857 /exec | |
| parent | 1f8d504f631531c199d7c6154a0dc442d80ea4a7 (diff) | |
| parent | 7e15f3d69a83a34ac62cbbee944a0bfbfa92724e (diff) | |
Merge branch 'master' into xkb
Conflicts:
config.make.in
configure.in
Diffstat (limited to 'exec')
| -rw-r--r-- | exec/do-bunzip2.c | 2 | ||||
| -rw-r--r-- | exec/exec.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/exec/do-bunzip2.c b/exec/do-bunzip2.c index 17bbf911..716a0cde 100644 --- a/exec/do-bunzip2.c +++ b/exec/do-bunzip2.c @@ -150,7 +150,7 @@ bz2_fclose (void *stream) with *all* the algorithms contained herein, and with the consequences of modifying them, you should NOT meddle with the compression or decompression machinery. Incorrect changes can - and very likely *will* lead to disasterous loss of data. + and very likely *will* lead to disastrous loss of data. DISCLAIMER: I TAKE NO RESPONSIBILITY FOR ANY LOSS OF DATA ARISING FROM THE diff --git a/exec/exec.c b/exec/exec.c index 01d22e70..4c2fcec1 100644 --- a/exec/exec.c +++ b/exec/exec.c @@ -1061,7 +1061,7 @@ load (task_t usertask, struct execdata *e) if (e->info.elf.phdr[i].p_type == PT_LOAD) load_section (&e->info.elf.phdr[i], e); - /* The entry point address is relative to whereever we loaded the + /* The entry point address is relative to wherever we loaded the program text. */ e->entry += e->info.elf.loadbase; } |