diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-04-29 12:24:22 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-04-29 12:24:22 +0200 |
| commit | 810d723a0f57abdbc7e88ae18ae9408aa689f359 (patch) | |
| tree | 453d2f4e11b9eee153d303fed7325f0e636e161b /extra/gpsd | |
| parent | 92116b44c20c9b8e3ee49b794084d08d22e87cd3 (diff) | |
| parent | 4412991f6b4fd655fc1f51f8d79a0be0c10158b7 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/awesome/PKGBUILD
community-testing/open-vm-tools/PKGBUILD
extra/kshutdown/PKGBUILD
extra/lsof/PKGBUILD
multilib-testing/lib32-glib2/PKGBUILD
multilib/wine/PKGBUILD
testing/racket/PKGBUILD
Diffstat (limited to 'extra/gpsd')
| -rw-r--r-- | extra/gpsd/PKGBUILD | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/extra/gpsd/PKGBUILD b/extra/gpsd/PKGBUILD index 8c9db89c6..de4cf0cf9 100644 --- a/extra/gpsd/PKGBUILD +++ b/extra/gpsd/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 157111 2012-04-23 23:54:24Z tomegun $ +# $Id: PKGBUILD 157357 2012-04-27 21:14:32Z tomegun $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> |