diff options
| author | Fredrik Rinnestam <fredrik@crux.nu> | 2016-12-24 23:33:16 +0100 |
|---|---|---|
| committer | Fredrik Rinnestam <fredrik@crux.nu> | 2016-12-24 23:33:16 +0100 |
| commit | 4d2d411d7d73420f507f02a8b626af57b25c11ab (patch) | |
| tree | 24248fd4e8d50e0819d7d1435fc65c2d3d26b9ac /btrfs-progs | |
| parent | 52fff80fbefe3cef060f5c3fb07727fada4ba21b (diff) | |
| parent | 03a9e3569812f47890dabbfc7ade97f641b2027e (diff) | |
| download | opt-4d2d411d7d73420f507f02a8b626af57b25c11ab.tar.gz opt-4d2d411d7d73420f507f02a8b626af57b25c11ab.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.5.tar.xz | bin | 72724 -> 0 bytes | |||
| -rw-r--r-- | btrfs-progs/btrfs-progs-man-v4.9.tar.xz | bin | 0 -> 72980 bytes |
4 files changed, 3 insertions, 3 deletions
diff --git a/btrfs-progs/.md5sum b/btrfs-progs/.md5sum index 2031510cf..2d247d9d6 100644 --- a/btrfs-progs/.md5sum +++ b/btrfs-progs/.md5sum @@ -1,2 +1,2 @@ -48c3a91cb4bef561a94f9640c3c230df btrfs-progs-man-v4.8.5.tar.xz -c2be5b040bd8605be7e98a907a043e45 btrfs-progs-v4.8.5.tar.xz +7b4cf377e55afb43f2c89b375e380b73 btrfs-progs-man-v4.9.tar.xz +5ba59ab2cf6d35a86920ab439bc99cb8 btrfs-progs-v4.9.tar.xz diff --git a/btrfs-progs/Pkgfile b/btrfs-progs/Pkgfile index 6e1d857a2..ec91f0be4 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.5 +version=4.9 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.5.tar.xz b/btrfs-progs/btrfs-progs-man-v4.8.5.tar.xz Binary files differdeleted file mode 100644 index 4d3bdcdd3..000000000 --- a/btrfs-progs/btrfs-progs-man-v4.8.5.tar.xz +++ /dev/null diff --git a/btrfs-progs/btrfs-progs-man-v4.9.tar.xz b/btrfs-progs/btrfs-progs-man-v4.9.tar.xz Binary files differnew file mode 100644 index 000000000..319ac39ee --- /dev/null +++ b/btrfs-progs/btrfs-progs-man-v4.9.tar.xz |