]> git.ipfire.org Git - thirdparty/zlib-ng.git/commit
Fix minor merge conflict
authorHans Kristian Rosbach <hk-git@circlestorm.org>
Tue, 12 May 2015 21:22:47 +0000 (23:22 +0200)
committerHans Kristian Rosbach <hk-git@circlestorm.org>
Tue, 12 May 2015 21:22:47 +0000 (23:22 +0200)
commitbc5e0d74510daa647df6c365499e3373fd993f2a
treedc1f2f796b04b56252dccfe1b070e6eb70960c34
parent38c3dcdd5afa0a659f6e38383d9d5b4b1a3fafa0
Fix minor merge conflict
test/minigzip.c