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 /applets | |
| 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 'applets')
| -rw-r--r-- | applets/Kbuild.src | 2 | ||||
| -rw-r--r-- | applets/applet_tables.c | 2 | ||||
| -rw-r--r-- | applets/applets.c | 2 | ||||
| -rw-r--r-- | applets/individual.c | 2 | ||||
| -rw-r--r-- | applets/usage.c | 2 | ||||
| -rw-r--r-- | applets/usage_pod.c | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/applets/Kbuild.src b/applets/Kbuild.src index 31fee8d1e..9b9808f25 100644 --- a/applets/Kbuild.src +++ b/applets/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 | obj-y := | 7 | obj-y := |
| 8 | obj-y += applets.o | 8 | obj-y += applets.o |
diff --git a/applets/applet_tables.c b/applets/applet_tables.c index f56908420..32dcdb73d 100644 --- a/applets/applet_tables.c +++ b/applets/applet_tables.c | |||
| @@ -5,7 +5,7 @@ | |||
| 5 | * | 5 | * |
| 6 | * Copyright (C) 2007 Denys Vlasenko <vda.linux@googlemail.com> | 6 | * Copyright (C) 2007 Denys Vlasenko <vda.linux@googlemail.com> |
| 7 | * | 7 | * |
| 8 | * Licensed under GPLv2, see file LICENSE in this tarball for details. | 8 | * Licensed under GPLv2, see file LICENSE in this source tree. |
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #include <stdlib.h> | 11 | #include <stdlib.h> |
diff --git a/applets/applets.c b/applets/applets.c index 5a7b88e88..98c2b44f5 100644 --- a/applets/applets.c +++ b/applets/applets.c | |||
| @@ -4,7 +4,7 @@ | |||
| 4 | * | 4 | * |
| 5 | * Copyright (C) 2007 Denys Vlasenko <vda.linux@googlemail.com> | 5 | * Copyright (C) 2007 Denys Vlasenko <vda.linux@googlemail.com> |
| 6 | * | 6 | * |
| 7 | * Licensed under GPLv2, see file LICENSE in this tarball for details. | 7 | * Licensed under GPLv2, see file LICENSE in this source tree. |
| 8 | */ | 8 | */ |
| 9 | #include "busybox.h" | 9 | #include "busybox.h" |
| 10 | 10 | ||
diff --git a/applets/individual.c b/applets/individual.c index 341f4d1c2..1e74e4ce5 100644 --- a/applets/individual.c +++ b/applets/individual.c | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | * | 2 | * |
| 3 | * Copyright 2005 Rob Landley <rob@landley.net | 3 | * Copyright 2005 Rob Landley <rob@landley.net |
| 4 | * | 4 | * |
| 5 | * Licensed under GPL version 2, see file LICENSE in this tarball for details | 5 | * Licensed under GPLv2, see file LICENSE in this source tree. |
| 6 | */ | 6 | */ |
| 7 | 7 | ||
| 8 | const char *applet_name; | 8 | const char *applet_name; |
diff --git a/applets/usage.c b/applets/usage.c index 46adbf475..94520ff66 100644 --- a/applets/usage.c +++ b/applets/usage.c | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | /* | 2 | /* |
| 3 | * Copyright (C) 2008 Denys Vlasenko. | 3 | * Copyright (C) 2008 Denys Vlasenko. |
| 4 | * | 4 | * |
| 5 | * Licensed under GPLv2, see file LICENSE in this tarball for details. | 5 | * Licensed under GPLv2, see file LICENSE in this source tree. |
| 6 | */ | 6 | */ |
| 7 | #include <unistd.h> | 7 | #include <unistd.h> |
| 8 | #include <stdlib.h> | 8 | #include <stdlib.h> |
diff --git a/applets/usage_pod.c b/applets/usage_pod.c index 85a2a8ec4..da0baefc6 100644 --- a/applets/usage_pod.c +++ b/applets/usage_pod.c | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | /* | 2 | /* |
| 3 | * Copyright (C) 2009 Denys Vlasenko. | 3 | * Copyright (C) 2009 Denys Vlasenko. |
| 4 | * | 4 | * |
| 5 | * Licensed under GPLv2, see file LICENSE in this tarball for details. | 5 | * Licensed under GPLv2, see file LICENSE in this source tree. |
| 6 | */ | 6 | */ |
| 7 | #include <unistd.h> | 7 | #include <unistd.h> |
| 8 | #include <stdint.h> | 8 | #include <stdint.h> |