Whamcloud - gitweb
Merge tag 'v1.42.12' into next
authorTheodore Ts'o <tytso@mit.edu>
Fri, 29 Aug 2014 15:38:33 +0000 (11:38 -0400)
committerTheodore Ts'o <tytso@mit.edu>
Fri, 29 Aug 2014 15:38:33 +0000 (11:38 -0400)
v1.42.12

Conflicts:
version.h

1  2 
RELEASE-NOTES
debian/changelog
e2fsck/problem.c
misc/ext4.5.in
version.h

diff --cc RELEASE-NOTES
Simple merge
Simple merge
Simple merge
diff --cc misc/ext4.5.in
Simple merge
diff --cc 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.42.12"
 +#define E2FSPROGS_VERSION "1.43-WIP"
- #define E2FSPROGS_DATE "25-Aug-2014"
+ #define E2FSPROGS_DATE "29-Aug-2014"