diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2011-01-04 19:56:11 +0700 |
|---|---|---|
| committer | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2011-01-04 19:56:11 +0700 |
| commit | 9db69882bee2d528d706d61d34ef7741122330be (patch) | |
| tree | f46c4ed5cae58956cd165e552ea4e366fd9b1a6c /util-linux/script.c | |
| parent | 3f357a9c754805c4c38793749927aeda82797735 (diff) | |
| parent | e4dcba1c103dc28e927e004791e331aaf604383d (diff) | |
| download | busybox-w32-9db69882bee2d528d706d61d34ef7741122330be.tar.gz busybox-w32-9db69882bee2d528d706d61d34ef7741122330be.tar.bz2 busybox-w32-9db69882bee2d528d706d61d34ef7741122330be.zip | |
Merge commit 'e4dcba1c103dc28e927e004791e331aaf604383d'
Conflicts:
libbb/make_directory.c
Diffstat (limited to 'util-linux/script.c')
| -rw-r--r-- | util-linux/script.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/util-linux/script.c b/util-linux/script.c index 0860bb083..b9317fc7c 100644 --- a/util-linux/script.c +++ b/util-linux/script.c | |||
| @@ -6,7 +6,7 @@ | |||
| 6 | * | 6 | * |
| 7 | * Based on code from util-linux v 2.12r | 7 | * Based on code from util-linux v 2.12r |
| 8 | * Copyright (c) 1980 | 8 | * Copyright (c) 1980 |
| 9 | * The Regents of the University of California. All rights reserved. | 9 | * The Regents of the University of California. All rights reserved. |
| 10 | * | 10 | * |
| 11 | * Licensed under GPLv2 or later, see file LICENSE in this source tree. | 11 | * Licensed under GPLv2 or later, see file LICENSE in this source tree. |
| 12 | */ | 12 | */ |