From: Theodore Ts'o <tytso@mit.edu>
Date: Fri, 29 Jan 2021 06:13:18 +0000 (-0500)
Subject: Merge branch 'maint' into next
X-Git-Tag: v1.46.0~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e678ab3970d03741cc16f8b9e2575af981f8f463;p=thirdparty%2Fe2fsprogs.git

Merge branch 'maint' into next
---

e678ab3970d03741cc16f8b9e2575af981f8f463
diff --cc version.h
index 48ff9b695,7c852fae6..844fce23b
--- a/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.46-WIP"
- #define E2FSPROGS_DATE "20-Mar-2020"
 -#define E2FSPROGS_VERSION "1.45.7"
 -#define E2FSPROGS_DATE "28-Jan-2021"
++#define E2FSPROGS_VERSION "1.46.0"
++#define E2FSPROGS_DATE "29-Jan-2020"