← Back to branch summary

~vcs-imports/e2fsprogs/trunk

~vcs-imports/e2fsprogs/trunk

Viewing all changes in revision 3715.

Committer: Theodore Ts'o
Date: 2014-08-25 22:37:37 UTC
mfrom: (3436.1.640)
Revision ID: git-v1:c1c8800b71521959b0ea3e8e385ed9e01f902612

Merge branch 'maint' into next

Conflicts:
        RELEASE-NOTES
        debian/changelog
        version.h

Show diffs side-by-side

added added

removed removed

debian/changelog

debian/e2fslibs.symbols

debugfs/set_fields.c

doc/libext2fs.texinfo

misc/dumpe2fs.c

misc/mke2fs.8.in

po/e2fsprogs.pot

resize/resize2fs.8.in

tests/r_inline_xattr/expect

tests/r_min_itable/expect

tests/r_move_itable/expect

tests/r_resize_inode/expect

Older »