diff options
author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2010-09-14 13:57:26 +1000 |
---|---|---|
committer | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2010-09-14 13:57:26 +1000 |
commit | 0c9d2455301ed633826e222aacd930126990913e (patch) | |
tree | 2353a480f55dfa41d9e6d2fa328af1b60dd3653e /debianutils | |
parent | e8db4fe96b3a68b6f971d88084ef2fd2c8513e78 (diff) | |
parent | 9dc04124d5a3f0c9be249287817a964691e187b0 (diff) | |
download | busybox-w32-0c9d2455301ed633826e222aacd930126990913e.tar.gz busybox-w32-0c9d2455301ed633826e222aacd930126990913e.tar.bz2 busybox-w32-0c9d2455301ed633826e222aacd930126990913e.zip |
Merge branch 'origin/master' (early part)
Diffstat (limited to 'debianutils')
-rw-r--r-- | debianutils/Kbuild.src | 2 | ||||
-rw-r--r-- | debianutils/mktemp.c | 2 | ||||
-rw-r--r-- | debianutils/pipe_progress.c | 2 | ||||
-rw-r--r-- | debianutils/run_parts.c | 2 | ||||
-rw-r--r-- | debianutils/start_stop_daemon.c | 2 | ||||
-rw-r--r-- | debianutils/which.c | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/debianutils/Kbuild.src b/debianutils/Kbuild.src index da34e4e4f..d41b5c8e4 100644 --- a/debianutils/Kbuild.src +++ b/debianutils/Kbuild.src | |||
@@ -2,7 +2,7 @@ | |||
2 | # | 2 | # |
3 | # Copyright (C) 1999-2005 by Erik Andersen <andersen@codepoet.org> | 3 | # Copyright (C) 1999-2005 by Erik Andersen <andersen@codepoet.org> |
4 | # | 4 | # |
5 | # Licensed under the GPL v2, see the file LICENSE in this tarball. | 5 | # Licensed under GPLv2, see file LICENSE in this source tree. |
6 | 6 | ||
7 | lib-y:= | 7 | lib-y:= |
8 | 8 | ||
diff --git a/debianutils/mktemp.c b/debianutils/mktemp.c index 7ce9f1096..86881f86d 100644 --- a/debianutils/mktemp.c +++ b/debianutils/mktemp.c | |||
@@ -6,7 +6,7 @@ | |||
6 | * Copyright (C) 2000 by Daniel Jacobowitz | 6 | * Copyright (C) 2000 by Daniel Jacobowitz |
7 | * Written by Daniel Jacobowitz <dan@debian.org> | 7 | * Written by Daniel Jacobowitz <dan@debian.org> |
8 | * | 8 | * |
9 | * Licensed under the GPL v2 or later, see the file LICENSE in this tarball. | 9 | * Licensed under GPLv2 or later, see file LICENSE in this source tree. |
10 | */ | 10 | */ |
11 | 11 | ||
12 | /* Coreutils 6.12 man page says: | 12 | /* Coreutils 6.12 man page says: |
diff --git a/debianutils/pipe_progress.c b/debianutils/pipe_progress.c index 6adefac99..1e57dc241 100644 --- a/debianutils/pipe_progress.c +++ b/debianutils/pipe_progress.c | |||
@@ -4,7 +4,7 @@ | |||
4 | * | 4 | * |
5 | * Copyright (C) 2003 by Rob Landley <rob@landley.net>, Joey Hess | 5 | * Copyright (C) 2003 by Rob Landley <rob@landley.net>, Joey Hess |
6 | * | 6 | * |
7 | * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. | 7 | * Licensed under GPLv2 or later, see file LICENSE in this source tree. |
8 | */ | 8 | */ |
9 | #include "libbb.h" | 9 | #include "libbb.h" |
10 | 10 | ||
diff --git a/debianutils/run_parts.c b/debianutils/run_parts.c index ba05897f9..b93a5a917 100644 --- a/debianutils/run_parts.c +++ b/debianutils/run_parts.c | |||
@@ -12,7 +12,7 @@ | |||
12 | * Copyright (C) 1996-1999 Guy Maor <maor@debian.org> | 12 | * Copyright (C) 1996-1999 Guy Maor <maor@debian.org> |
13 | * | 13 | * |
14 | * | 14 | * |
15 | * Licensed under GPL v2 or later, see file LICENSE in this tarball for details. | 15 | * Licensed under GPLv2 or later, see file LICENSE in this source tree. |
16 | */ | 16 | */ |
17 | 17 | ||
18 | /* This is my first attempt to write a program in C (well, this is my first | 18 | /* This is my first attempt to write a program in C (well, this is my first |
diff --git a/debianutils/start_stop_daemon.c b/debianutils/start_stop_daemon.c index 568f32eec..d2ee95068 100644 --- a/debianutils/start_stop_daemon.c +++ b/debianutils/start_stop_daemon.c | |||
@@ -5,7 +5,7 @@ | |||
5 | * Written by Marek Michalkiewicz <marekm@i17linuxb.ists.pwr.wroc.pl>, | 5 | * Written by Marek Michalkiewicz <marekm@i17linuxb.ists.pwr.wroc.pl>, |
6 | * Adapted for busybox David Kimdon <dwhedon@gordian.com> | 6 | * Adapted for busybox David Kimdon <dwhedon@gordian.com> |
7 | * | 7 | * |
8 | * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. | 8 | * Licensed under GPLv2 or later, see file LICENSE in this source tree. |
9 | */ | 9 | */ |
10 | 10 | ||
11 | /* | 11 | /* |
diff --git a/debianutils/which.c b/debianutils/which.c index 59dedf58d..0cf786803 100644 --- a/debianutils/which.c +++ b/debianutils/which.c | |||
@@ -5,7 +5,7 @@ | |||
5 | * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org> | 5 | * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org> |
6 | * Copyright (C) 2006 Gabriel Somlo <somlo at cmu.edu> | 6 | * Copyright (C) 2006 Gabriel Somlo <somlo at cmu.edu> |
7 | * | 7 | * |
8 | * Licensed under the GPL v2 or later, see the file LICENSE in this tarball. | 8 | * Licensed under GPLv2 or later, see file LICENSE in this source tree. |
9 | * | 9 | * |
10 | * Based on which from debianutils | 10 | * Based on which from debianutils |
11 | */ | 11 | */ |