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: 2ffccc8 036a847)

author	Theodore Ts'o <tytso@mit.edu>
	Sun, 29 Dec 2013 04:27:39 +0000 (23:27 -0500)
committer	Theodore Ts'o <tytso@mit.edu>
	Sun, 29 Dec 2013 04:27:39 +0000 (23:27 -0500)
commit	9c846766fd8f8f2c4f37effa617df949f453ca47
tree	57f920191477565b3d92e0c0c168a1026cbaf5eb	tree
parent	2ffccc82c4b9ed935e45118e325896b70e9e3eb0	commit \| diff
parent	036a84710dfe0d9b47cba835b8eba38a06a447ea	commit \| diff

Merge branch 'maint' into next

Conflicts:
RELEASE-NOTES
debian/changelog
version.h

RELEASE-NOTES	diff1 \|	diff2 \|	blob \| history
debian/changelog	diff1 \|	diff2 \|	blob \| history
debian/e2fslibs.symbols	diff1 \|	diff2 \|	blob \| history
debugfs/debugfs.8.in	diff1 \|	diff2 \|	blob \| history
misc/e2image.c	diff1 \|	diff2 \|	blob \| history
version.h	diff1 \|	diff2 \|	blob \| history

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