Merge branch '3.1' into 3.2

2015-07-14 22:16:30 +02:00 · 2015-07-14 22:16:30 +02:00 · f551175ae8
commit f551175ae8
parent fec496cff8 2c4b5d345c
4 changed files with 3 additions and 3 deletions
--- a/btrfs-progs/.md5sum
+++ b/btrfs-progs/.md5sum
@ -1,2 +1,2 @@
-ca353a5db9b34356b09208269bf761cb  btrfs-progs-man-v4.1.1.tar.xz
-3a8ac5d99eba45f296f9eafea76ce9c7  btrfs-progs-v4.1.1.tar.xz
+ee354f02d7859a99485977840d7ecfd2  btrfs-progs-man-v4.1.2.tar.xz
+f6655ea42682487e1beca6c33b787a22  btrfs-progs-v4.1.2.tar.xz
--- a/btrfs-progs/Pkgfile
+++ b/btrfs-progs/Pkgfile
@ -4,7 +4,7 @@
 # Depends on:  util-linux e2fsprogs lzo zlib

 name=btrfs-progs
-version=4.1.1
+version=4.1.2
 release=1
 source=(https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v$version.tar.xz \
        $name-man-v$version.tar.xz)
--- a/btrfs-progs/btrfs-progs-man-v4.1.1.tar.xz
+++ b/btrfs-progs/btrfs-progs-man-v4.1.1.tar.xz
--- a/btrfs-progs/btrfs-progs-man-v4.1.2.tar.xz
+++ b/btrfs-progs/btrfs-progs-man-v4.1.2.tar.xz