diff options
| author | Xin LI <delphij@FreeBSD.org> | 2008-03-20 02:56:24 +0000 |
|---|---|---|
| committer | Xin LI <delphij@FreeBSD.org> | 2008-03-20 02:56:24 +0000 |
| commit | 577cb6d7433c66d20337bf067f09258b3aaab5d9 (patch) | |
| tree | 35b991f4d56986d4e7db6a91752512debc56cff2 /contrib/bzip2/bzip2.c | |
| parent | b74c250e77d8b0c008bf0793496b8d6bec1882b6 (diff) | |
| download | src-577cb6d7433c66d20337bf067f09258b3aaab5d9.tar.gz src-577cb6d7433c66d20337bf067f09258b3aaab5d9.zip | |
Resolve conflicts.
Notes
Notes:
svn path=/head/; revision=177424
Diffstat (limited to 'contrib/bzip2/bzip2.c')
| -rw-r--r-- | contrib/bzip2/bzip2.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/contrib/bzip2/bzip2.c b/contrib/bzip2/bzip2.c index 5fbae0ebe47f..390410735b54 100644 --- a/contrib/bzip2/bzip2.c +++ b/contrib/bzip2/bzip2.c @@ -7,8 +7,8 @@ This file is part of bzip2/libbzip2, a program and library for lossless, block-sorting data compression. - bzip2/libbzip2 version 1.0.4 of 20 December 2006 - Copyright (C) 1996-2006 Julian Seward <jseward@bzip.org> + bzip2/libbzip2 version 1.0.5 of 10 December 2007 + Copyright (C) 1996-2007 Julian Seward <jseward@bzip.org> Please read the WARNING, DISCLAIMER and PATENTS sections in the README file. @@ -1605,11 +1605,11 @@ void license ( void ) "bzip2, a block-sorting file compressor. " "Version %s.\n" " \n" - " Copyright (C) 1996-2006 by Julian Seward.\n" + " Copyright (C) 1996-2007 by Julian Seward.\n" " \n" " This program is free software; you can redistribute it and/or modify\n" " it under the terms set out in the LICENSE file, which is included\n" - " in the bzip2-1.0.4 source distribution.\n" + " in the bzip2-1.0.5 source distribution.\n" " \n" " This program is distributed in the hope that it will be useful,\n" " but WITHOUT ANY WARRANTY; without even the implied warranty of\n" |