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 /libbb/progress.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 'libbb/progress.c')
| -rw-r--r-- | libbb/progress.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libbb/progress.c b/libbb/progress.c index f53271398..4c2763c53 100644 --- a/libbb/progress.c +++ b/libbb/progress.c | |||
| @@ -7,7 +7,7 @@ | |||
| 7 | */ | 7 | */ |
| 8 | /*- | 8 | /*- |
| 9 | * Copyright (c) 1992, 1993 | 9 | * Copyright (c) 1992, 1993 |
| 10 | * The Regents of the University of California. All rights reserved. | 10 | * The Regents of the University of California. All rights reserved. |
| 11 | * | 11 | * |
| 12 | * Redistribution and use in source and binary forms, with or without | 12 | * Redistribution and use in source and binary forms, with or without |
| 13 | * modification, are permitted provided that the following conditions | 13 | * modification, are permitted provided that the following conditions |
| @@ -18,8 +18,8 @@ | |||
| 18 | * notice, this list of conditions and the following disclaimer in the | 18 | * notice, this list of conditions and the following disclaimer in the |
| 19 | * documentation and/or other materials provided with the distribution. | 19 | * documentation and/or other materials provided with the distribution. |
| 20 | * | 20 | * |
| 21 | * 3. <BSD Advertising Clause omitted per the July 22, 1999 licensing change | 21 | * 3. BSD Advertising Clause omitted per the July 22, 1999 licensing change |
| 22 | * ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change> | 22 | * ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change |
| 23 | * | 23 | * |
| 24 | * 4. Neither the name of the University nor the names of its contributors | 24 | * 4. Neither the name of the University nor the names of its contributors |
| 25 | * may be used to endorse or promote products derived from this software | 25 | * may be used to endorse or promote products derived from this software |