summaryrefslogtreecommitdiff
path: root/community/conntrack-tools/PKGBUILD
diff options
context:
space:
mode:
authorMichał Masłowski <mtjm@mtjm.eu>2013-02-06 15:15:42 +0100
committerMichał Masłowski <mtjm@mtjm.eu>2013-02-06 15:15:42 +0100
commit9437cdbc03cb103235fa0b043f4cf73882f10f34 (patch)
tree5dba8834685e18222c996b3cd4c728958ed3a49b /community/conntrack-tools/PKGBUILD
parent7cfa9860fb15a4bf5066e33255da1a9b09cc95b1 (diff)
parenta110e74fe4a31aebb09e0da6e407af69ed996837 (diff)
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts: community/drbd/PKGBUILD community/dumb/PKGBUILD community/echat/PKGBUILD community/librcc/PKGBUILD community/linux-tools/PKGBUILD community/python2-pysqlite-legacy/PKGBUILD community/python2-pyxmpp/PKGBUILD core/libksba/PKGBUILD core/ncurses/PKGBUILD extra/libbonobo/PKGBUILD extra/libmpeg2/PKGBUILD extra/qt/PKGBUILD extra/rarian/PKGBUILD extra/wpa_supplicant_gui/PKGBUILD libre/audacious-plugins-libre/PKGBUILD
Diffstat (limited to 'community/conntrack-tools/PKGBUILD')
-rw-r--r--community/conntrack-tools/PKGBUILD4
1 files changed, 2 insertions, 2 deletions
diff --git a/community/conntrack-tools/PKGBUILD b/community/conntrack-tools/PKGBUILD
index 9c71b777a..29fbfa561 100644
--- a/community/conntrack-tools/PKGBUILD
+++ b/community/conntrack-tools/PKGBUILD
@@ -1,5 +1,5 @@
-# $Id: PKGBUILD 83583 2013-02-03 13:25:07Z seblu $
-# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
+# $Id: PKGBUILD 83854 2013-02-05 18:12:01Z eric $
+# Maintainer: Sébastien Luttringer
# Contributor: Valere Monseur <valere_monseur@hotmail.com>
# Contributor: Alessandro Sagratini <ale_sagra@hotmail.com>
# Contributor: Kevin Edmonds <edmondskevin@hotmail.com>