git.ipfire.org Git - thirdparty/e2fsprogs.git/commit

]> git.ipfire.org Git - thirdparty/e2fsprogs.git/commit

projects / thirdparty / e2fsprogs.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: a070f28 2172519)

author	Theodore Ts'o <tytso@mit.edu>
	Tue, 29 Aug 2017 12:03:31 +0000 (08:03 -0400)
committer	Theodore Ts'o <tytso@mit.edu>
	Tue, 29 Aug 2017 12:03:31 +0000 (08:03 -0400)
commit	58a31b508e2cc520565d5de20c9087ac36923164
tree	3fda3205008b1a5cb9bc4b444194229e5bb326e5	tree \| snapshot
parent	a070f28b4f11bccb8d1ffb58b758f4de5d9f642f	commit \| diff
parent	2172519d766198a587e4474eaa829578cde4f433	commit \| diff

Merge branch 'maint' into next

13 files changed:

configure	diff1 \|	diff2 \|	blob \| history
configure.ac	diff1 \|	diff2 \|	blob \| history
e2fsck/e2fsck.h	diff1 \|	diff2 \|	blob \| history
e2fsck/message.c	diff1 \|	diff2 \|	blob \| history
e2fsck/pass1.c	diff1 \|	diff2 \|	blob \| history
lib/blkid/devname.c	diff1 \|	diff2 \|	blob \| history
lib/ext2fs/Makefile.in	diff1 \|	diff2 \|	blob \| history
lib/ext2fs/ext2fs.h	diff1 \|	diff2 \|	blob \| history
lib/ext2fs/unix_io.c	diff1 \|	diff2 \|	blob \| history
misc/mke2fs.c	diff1 \|	diff2 \|	blob \| history
misc/tune2fs.c	diff1 \|	diff2 \|	blob \| history
tests/Makefile.in	diff1 \|	diff2 \|	blob \| history
tests/test_one.in	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.