summaryrefslogtreecommitdiff
path: root/~emulatorman/xonotic-data
diff options
context:
space:
mode:
authorMichał Masłowski <mtjm@mtjm.eu>2013-07-04 19:48:31 +0200
committerMichał Masłowski <mtjm@mtjm.eu>2013-07-04 19:48:31 +0200
commitee9c1a601c6ce156c295e4a4608ad50535192954 (patch)
tree49757b312b758e793ffd8bfedd2d6665cd0b3e29 /~emulatorman/xonotic-data
parent2690b2e42de85dbcbca602f3299ae4404918e94d (diff)
parente9eb2503b10fe4c4aefbee39226c8962d72d58bd (diff)
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts: community/bitcoin/PKGBUILD community/calc/PKGBUILD community/fcitx/PKGBUILD community/gloobus-preview/PKGBUILD community/linux-tools/PKGBUILD community/smc/PKGBUILD extra/elfutils/PKGBUILD extra/freenx/PKGBUILD extra/gnome-alsamixer/PKGBUILD extra/gvfs/PKGBUILD extra/kdenetwork/PKGBUILD extra/kdepim/PKGBUILD extra/kdesdk-kate/PKGBUILD extra/lcms2/PKGBUILD extra/libmspack/PKGBUILD extra/libtheora/PKGBUILD extra/mesa/PKGBUILD extra/nx-common/PKGBUILD extra/opennx/PKGBUILD extra/perl-tk/PKGBUILD extra/qt4/PKGBUILD extra/soprano/PKGBUILD extra/wireshark/PKGBUILD extra/xmlsec/PKGBUILD extra/xorg-server/PKGBUILD libre/audacious-plugins-libre/PKGBUILD libre/ipsec-tools-libre/PKGBUILD libre/tomoyo-tools-libre/PKGBUILD pcr/amsynth/PKGBUILD
Diffstat (limited to '~emulatorman/xonotic-data')
-rw-r--r--~emulatorman/xonotic-data/PKGBUILD2
1 files changed, 1 insertions, 1 deletions
diff --git a/~emulatorman/xonotic-data/PKGBUILD b/~emulatorman/xonotic-data/PKGBUILD
index 114954fc3..13f4d5c12 100644
--- a/~emulatorman/xonotic-data/PKGBUILD
+++ b/~emulatorman/xonotic-data/PKGBUILD
@@ -1,7 +1,7 @@
# $Id: PKGBUILD 35989 2010-12-25 03:22:46Z svenstaro $
# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
# Contributor: Alexander Suhoverhov <cy at ngs dot ru>
-# Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy>
+# Contributor (Parabola): André Silva <emulatorman@lavabit.com>
pkgname=xonotic-data
pkgver=0.5.0