diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-06-11 15:22:39 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-06-11 15:22:39 -0300 |
| commit | d9929db3b4ad2dfeeb19ad71f6016eb8122d0208 (patch) | |
| tree | 72944f18f0c554390a9ced86c8a8e2c06ce6cc47 /community/prosody/PKGBUILD | |
| parent | 54452120abed3fa83e394e89110859525788c0ea (diff) | |
| parent | 306ac55c1e99cfb5801ef0d9acf2a11d3994d80d (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/hostapd/PKGBUILD
extra/samba/PKGBUILD
staging/ffmpeg/PKGBUILD
Diffstat (limited to 'community/prosody/PKGBUILD')
| -rw-r--r-- | community/prosody/PKGBUILD | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/community/prosody/PKGBUILD b/community/prosody/PKGBUILD index 9dc7f4f2a..b1d0d47bf 100644 --- a/community/prosody/PKGBUILD +++ b/community/prosody/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 70828 2012-05-17 10:16:37Z spupykin $ +# $Id: PKGBUILD 72148 2012-06-09 06:00:05Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Dwayne Bent <dbb.0@liqd.org> # Contributor: Paul-Sebastian Manole <brokenthorn@gmail.com> |