diff options
author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-06-27 11:00:34 -0300 |
---|---|---|
committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-06-27 11:00:34 -0300 |
commit | 6fa19b4570c3cef91cf336bbefd6b9583e89ecce (patch) | |
tree | 62facaa87cc6fd640437cc18226ca853496a4a02 /core/openssh | |
parent | 57fc26a638bd3856b660dd8839999d5bab9bfeac (diff) | |
parent | 5aee7ab49f65d6fee1182bfcacf92192ad36c4af (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/moreutils/PKGBUILD
core/iputils/PKGBUILD
libre/texlive-bin-libre/PKGBUILD
testing/openldap/PKGBUILD
Diffstat (limited to 'core/openssh')
-rw-r--r-- | core/openssh/PKGBUILD | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/openssh/PKGBUILD b/core/openssh/PKGBUILD index ebc7ac10b..609916c0e 100644 --- a/core/openssh/PKGBUILD +++ b/core/openssh/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 162156 2012-06-22 12:56:57Z dreisner $ +# $Id: PKGBUILD 162326 2012-06-25 06:10:45Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Aaron Griffin <aaron@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> |