Forcefully merge the branch back. This updates the included version
authorjoerg <joerg>
Thu, 23 Sep 2010 11:03:35 +0000 (11:03 +0000)
committerjoerg <joerg>
Thu, 23 Sep 2010 11:03:35 +0000 (11:03 +0000)
commitf4e8b5e50398a7faa7ff4ecd738115fadadd1488
tree25e20bb9e9eb4347e5167a5f3effe96add34f2ae
parentfc5cbbcc5c5bf2f4740ec0bd94e7f9a9c265cc69
Forcefully merge the branch back. This updates the included version
numbers.
12 files changed:
archivers/bzip2/files/LICENSE
archivers/bzip2/files/blocksort.c
archivers/bzip2/files/bzip2.1
archivers/bzip2/files/bzip2.c
archivers/bzip2/files/bzip2recover.c
archivers/bzip2/files/bzlib.c
archivers/bzip2/files/bzlib.h
archivers/bzip2/files/bzlib_private.h
archivers/bzip2/files/compress.c
archivers/bzip2/files/crctable.c
archivers/bzip2/files/huffman.c
archivers/bzip2/files/randtable.c