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: 8c7c6eb c8a5708)

author	Theodore Ts'o <tytso@mit.edu>
	Mon, 28 Jan 2008 01:09:05 +0000 (20:09 -0500)
committer	Theodore Ts'o <tytso@mit.edu>
	Mon, 28 Jan 2008 01:09:05 +0000 (20:09 -0500)
commit	428f6b32a9029e1f0bc2559233954955a6aae64c
tree	69a22eeed287318371f415a568eaf30a9993e1ca	tree \| snapshot
parent	8c7c6eb1675b327387a24bc05ac98dfc890f8073	commit \| diff
parent	c8a5708db1bc66aa361d38e9c74aea929b793921	commit \| diff

Merge branch 'maint' into next

Conflicts:

configure
lib/ext2fs/ext2_fs.h
misc/e2image.c

13 files changed:

Makefile.in	diff1 \|	diff2 \|	blob \| history
configure	diff1 \|	diff2 \|	blob \| history
configure.in	diff1 \|	diff2 \|	blob \| history
debian/rules	diff1 \|	diff2 \|	blob \| history
doc/libext2fs.texinfo	diff1 \|	diff2 \|	blob \| history
e2fsck/Makefile.in	diff1 \|	diff2 \|	blob \| history
e2fsck/super.c	diff1 \|	diff2 \|	blob \| history
lib/blkid/probe.c	diff1 \|	diff2 \|	blob \| history
lib/ext2fs/ext2_fs.h	diff1 \|	diff2 \|	blob \| history
lib/ext2fs/initialize.c	diff1 \|	diff2 \|	blob \| history
misc/e2image.c	diff1 \|	diff2 \|	blob \| history
misc/mke2fs.c	diff1 \|	diff2 \|	blob \| history
misc/tune2fs.c	diff1 \|	diff2 \|	blob \| history

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