diff options
author | Fredrik Rinnestam <fredrik@crux.nu> | 2016-11-08 18:04:58 +0100 |
---|---|---|
committer | Fredrik Rinnestam <fredrik@crux.nu> | 2016-11-08 18:04:58 +0100 |
commit | 6b2bf7ef46f5bc358aaa511dc5ee37333708730c (patch) | |
tree | a470bd431425c851f59490c9ad6bc9226090c6e4 /btrfs-progs | |
parent | cab8fc1c5968c0b7383abec0bf2651a3338beca9 (diff) | |
parent | ae955fa5f05f02e4c71236dd75cd9c23a137bdf2 (diff) | |
download | opt-6b2bf7ef46f5bc358aaa511dc5ee37333708730c.tar.gz opt-6b2bf7ef46f5bc358aaa511dc5ee37333708730c.tar.xz |
Merge branch '3.2' into 3.3
Diffstat (limited to 'btrfs-progs')
-rw-r--r-- | btrfs-progs/.md5sum | 4 | ||||
-rw-r--r-- | btrfs-progs/Pkgfile | 2 | ||||
-rw-r--r-- | btrfs-progs/btrfs-progs-man-v4.8.1.tar.xz | bin | 72532 -> 0 bytes | |||
-rw-r--r-- | btrfs-progs/btrfs-progs-man-v4.8.2.tar.xz | bin | 0 -> 72544 bytes |
4 files changed, 3 insertions, 3 deletions
diff --git a/btrfs-progs/.md5sum b/btrfs-progs/.md5sum index db38e9d39..4395729a3 100644 --- a/btrfs-progs/.md5sum +++ b/btrfs-progs/.md5sum @@ -1,2 +1,2 @@ -d43e0eb08941f29896d160e4bf3edeb7 btrfs-progs-man-v4.8.1.tar.xz -127e109ed05274597d67c24c89861d49 btrfs-progs-v4.8.1.tar.xz +dafb34355455bef639201b7aaaf2b12f btrfs-progs-man-v4.8.2.tar.xz +903f87886a7810a6819e8db915e4ec29 btrfs-progs-v4.8.2.tar.xz diff --git a/btrfs-progs/Pkgfile b/btrfs-progs/Pkgfile index adaefb669..3a11aea11 100644 --- a/btrfs-progs/Pkgfile +++ b/btrfs-progs/Pkgfile @@ -4,7 +4,7 @@ # Depends on: util-linux e2fsprogs lzo zlib name=btrfs-progs -version=4.8.1 +version=4.8.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) diff --git a/btrfs-progs/btrfs-progs-man-v4.8.1.tar.xz b/btrfs-progs/btrfs-progs-man-v4.8.1.tar.xz Binary files differdeleted file mode 100644 index 7feffae30..000000000 --- a/btrfs-progs/btrfs-progs-man-v4.8.1.tar.xz +++ /dev/null diff --git a/btrfs-progs/btrfs-progs-man-v4.8.2.tar.xz b/btrfs-progs/btrfs-progs-man-v4.8.2.tar.xz Binary files differnew file mode 100644 index 000000000..a915b9de3 --- /dev/null +++ b/btrfs-progs/btrfs-progs-man-v4.8.2.tar.xz |