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: ba526aa 6fa8edd)

author	Theodore Ts'o <tytso@mit.edu>
	Wed, 20 Jan 2021 04:58:57 +0000 (23:58 -0500)
committer	Theodore Ts'o <tytso@mit.edu>
	Wed, 20 Jan 2021 04:58:57 +0000 (23:58 -0500)
commit	0d47f5ab05177c1861f16bb3644a47018e6be1d0
tree	f189505ccaddf29f371c37e1512e7f6fe1cb7ed7	tree \| snapshot
parent	ba526aae3a8b3eff6bf8b895ef7a45bd557e27ac	commit \| diff
parent	6fa8edd0fde7a540b41d78e45743208c8edab0b1	commit \| diff

Merge branch 'maint' into next

MCONFIG.in	diff1 \|	diff2 \|	blob \| history
Makefile.in	diff1 \|	diff2 \|	blob \| history
debugfs/set_fields.c	diff1 \|	diff2 \|	blob \| history
e2fsck/Makefile.in	diff1 \|	diff2 \|	blob \| history
lib/e2p/Makefile.in	diff1 \|	diff2 \|	blob \| history
misc/Makefile.in	diff1 \|	diff2 \|	blob \| history
misc/filefrag.c	diff1 \|	diff2 \|	blob \| history
resize/Makefile.in	diff1 \|	diff2 \|	blob \| history
resize/main.c	diff1 \|	diff2 \|	blob \| history

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