diff options
| author | Juergen Daubert <jue@jue.li> | 2015-11-02 19:08:25 +0100 |
|---|---|---|
| committer | Juergen Daubert <jue@jue.li> | 2015-11-02 19:08:25 +0100 |
| commit | 025e7539f3179adf4139feb27c8e275feec26420 (patch) | |
| tree | d4efea685df4412a1f8329aa749b53a2a07574e7 /grep | |
| parent | a365ef2d95e06879ce7665fe564f2806eb48e75a (diff) | |
| parent | 48857fcf8eb5e29530caeebe416dedf5fbf704bb (diff) | |
| download | core-025e7539f3179adf4139feb27c8e275feec26420.tar.gz core-025e7539f3179adf4139feb27c8e275feec26420.tar.xz | |
Merge branch '3.1' into 3.2
Conflicts:
grep/Pkgfile
Diffstat (limited to 'grep')
| -rw-r--r-- | grep/.md5sum | 2 | ||||
| -rw-r--r-- | grep/Pkgfile | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/grep/.md5sum b/grep/.md5sum index d9d58635..f64d6b82 100644 --- a/grep/.md5sum +++ b/grep/.md5sum @@ -1 +1 @@ -43c48064d6409862b8a850db83c8038a grep-2.21.tar.xz +e1015e951a49a82b02e38891026ef5df grep-2.22.tar.xz diff --git a/grep/Pkgfile b/grep/Pkgfile index 15d1181d..fafe4e11 100644 --- a/grep/Pkgfile +++ b/grep/Pkgfile @@ -4,8 +4,8 @@ # Depends on: libpcre name=grep -version=2.21 -release=2 +version=2.22 +release=1 source=(http://ftp.gnu.org/gnu/$name/$name-$version.tar.xz) build() { |