diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-08-04 00:20:47 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-08-04 00:20:47 -0300 |
| commit | 97a74a6a87ccbeb5649f226377d0c10ae824f1e1 (patch) | |
| tree | 614d5483fcdab0aa6adecc7041c4b872ffb5a293 /extra/xorg-server | |
| parent | e8eefc5a3834440246552e54c169abfa0703672e (diff) | |
| parent | 8c2359e2541f9d1b11443b49d8ea502b3ffea39c (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/unifdef/PKGBUILD
extra/gtk2/PKGBUILD
extra/libmpeg2/PKGBUILD
extra/mesa/PKGBUILD
multilib/lib32-libdrm/PKGBUILD
multilib/lib32-libdrm/no-pthread-stubs.patch
multilib/lib32-mesa/PKGBUILD
Diffstat (limited to 'extra/xorg-server')
| -rw-r--r-- | extra/xorg-server/PKGBUILD | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/extra/xorg-server/PKGBUILD b/extra/xorg-server/PKGBUILD index ae05c054f..d40dd9d01 100644 --- a/extra/xorg-server/PKGBUILD +++ b/extra/xorg-server/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 130970 2011-07-09 09:10:44Z andyrtr $ +# $Id: PKGBUILD 130953 2011-07-09 08:01:22Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=xorg-server pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xdmx' 'xorg-server-xvfb' 'xorg-server-xnest' 'xorg-server-common' 'xorg-server-devel') pkgver=1.10.3 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') license=('custom') url="http://xorg.freedesktop.org" |