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: 26dacce 23d6dd1)

author	Theodore Ts'o <tytso@mit.edu>
	Tue, 22 Jul 2014 18:57:40 +0000 (14:57 -0400)
committer	Theodore Ts'o <tytso@mit.edu>
	Tue, 22 Jul 2014 18:57:40 +0000 (14:57 -0400)
commit	f9f3050a0ad9be1c37b00c8478199d286ddcaeda
tree	de4f122ffe0849a52e6e1f16ec29f5fa7f721ba4	tree \| snapshot
parent	26dacce72cb8d6d0d00e2377e255d9b3e900a09a	commit \| diff
parent	23d6dd1f1032af47d9a8cc7e9ecc1ec7a9b95718	commit \| diff

Merge branch 'maint' into next

Conflicts:
debian/changelog
e2fsck/pass1.c
lib/ext2fs/Makefile.in

debian/changelog	diff1 \|	diff2 \|	blob \| history
debugfs/debug_cmds.ct	diff1 \|	diff2 \|	blob \| history
debugfs/debugfs.8.in	diff1 \|	diff2 \|	blob \| history
debugfs/debugfs.c	diff1 \|	diff2 \|	blob \| history
debugfs/debugfs.h	diff1 \|	diff2 \|	blob \| history
debugfs/set_fields.c	diff1 \|	diff2 \|	blob \| history
e2fsck/pass1.c	diff1 \|	diff2 \|	blob \| history
e2fsck/pass1b.c	diff1 \|	diff2 \|	blob \| history
e2fsck/unix.c	diff1 \|	diff2 \|	blob \| history
lib/ext2fs/Makefile.in	diff1 \|	diff2 \|	blob \| history

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