resolve merge noise in favor of new upstream. note that this tosses out the
authorBdale Garbee <bdale@gag.com>
Tue, 20 Apr 2010 08:26:03 +0000 (02:26 -0600)
committerBdale Garbee <bdale@gag.com>
Tue, 20 Apr 2010 08:26:03 +0000 (02:26 -0600)
commit802f4f397f6823422798c944b833b112af37ce14
tree6327c196bc397ca89c6178202c4f6e9097a3d77d
parentdc0ab95dbae38577efebe2283fc9b76e92ef4233
resolve merge noise in favor of new upstream.  note that this tosses out the
support for --rsyncable, but re-merging that seems like the easiest path...
22 files changed:
INSTALL
Makefile.am
Makefile.in
build-aux/texinfo.tex
debian/copyright
deflate.c
gzip.1
gzip.c
gzip.h
lib/error.c
lib/fcntl_.h [deleted file]
lib/getopt.c
lib/getopt1.c
lib/getopt_.h [deleted file]
lib/stat_.h [deleted file]
lib/stdbool_.h [deleted file]
lib/stdlib_.h [deleted file]
lib/sys_time_.h [deleted file]
lib/time_.h [deleted file]
lib/unistd_.h [deleted file]
m4/absolute-header.m4 [deleted file]
trees.c