git.gag.com Git - debian/gzip/commit

projects / debian / gzip / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 4fc4e82 dc84183)

author	Bdale Garbee <bdale@gag.com>
	Tue, 19 Jun 2012 20:01:51 +0000 (14:01 -0600)
committer	Bdale Garbee <bdale@gag.com>
	Tue, 19 Jun 2012 20:01:51 +0000 (14:01 -0600)
commit	4ee107046a0ffd91f6c60c787326a5e27b799f6d
tree	642cccc7ba0ffd9f23257ced4062a8d615d8cb65	tree \| snapshot
parent	4fc4e82abfb3710733ab21e5dfcb81abdedbe5a2	commit \| diff
parent	dc84183747ce1703eb99685b5dbde1f65a143c06	commit \| diff

Merge tag 'upstream/1.5'

Upstream version 1.5

Conflicts:
deflate.c
gzip.1
gzip.c
gzip.doc
lib/getdtablesize.c
lib/sys_stat.in.h
m4/getdtablesize.m4
zless.in

configure.ac	diff1 \|	diff2 \|	blob \| history
deflate.c	diff1 \|	diff2 \|	blob \| history
doc/gzip.texi	diff1 \|	diff2 \|	blob \| history
gzip.1	diff1 \|	diff2 \|	blob \| history
gzip.c	diff1 \|	diff2 \|	blob \| history
gzip.h	diff1 \|	diff2 \|	blob \| history

Debian packaging of gzip