Merge tag 'v1.45.6' into next

author Theodore Ts'o <tytso@mit.edu>

Sun, 22 Mar 2020 02:34:30 +0000 (22:34 -0400)

committer Theodore Ts'o <tytso@mit.edu>

Sun, 22 Mar 2020 02:34:30 +0000 (22:34 -0400)
author Theodore Ts'o <tytso@mit.edu>
Sun, 22 Mar 2020 02:34:30 +0000 (22:34 -0400)
committer Theodore Ts'o <tytso@mit.edu>
Sun, 22 Mar 2020 02:34:30 +0000 (22:34 -0400)
diff --cc debian/changelog
Simple merge
diff --cc debian/libext2fs2.symbols
Simple merge
diff --cc e2fsck/Android.bp
Simple merge
diff --cc lib/e2p/feature.c
Simple merge
diff --cc version.h

index da06950e0e8055479b595c41b15456aeca8c4f37,ad8fce1ed56b5b8bc069a7720d1d97bf7984a1b7..48ff9b695b8a9ed5c1de9ade322ef936feeb2297
--- 1/version.h
--- 2/version.h
+++ b/version.h
@@@ -7,5 -7,5 +7,5 @@@
    * file may be redistributed under the GNU Public License v2.
    */
   
- -#define E2FSPROGS_VERSION "1.45.6"
+ +#define E2FSPROGS_VERSION "1.46-WIP"
- #define E2FSPROGS_DATE "09-Oct-2019"
+ #define E2FSPROGS_DATE "20-Mar-2020"
author	Theodore Ts'o <tytso@mit.edu>
	Sun, 22 Mar 2020 02:34:30 +0000 (22:34 -0400)
committer	Theodore Ts'o <tytso@mit.edu>
	Sun, 22 Mar 2020 02:34:30 +0000 (22:34 -0400)
		1	2
debian/changelog	patch \|	diff1 \|	diff2 \|	blob \| history
debian/libext2fs2.symbols	patch \|	diff1 \|	diff2 \|	blob \| history
e2fsck/Android.bp	patch \|	diff1 \|	diff2 \|	blob \| history
lib/e2p/feature.c	patch \|	diff1 \|	diff2 \|	blob \| history
version.h	patch \|	diff1 \|	diff2 \|	blob \| history