diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2013-02-13 10:18:14 +0100 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-02-13 10:18:14 +0100 |
commit | d27bbcebde95f792e0660af3657878216b2590c3 (patch) | |
tree | ebd693dbaeb22eb25643e06b80facc1e0f073e77 /extra/networkmanager/PKGBUILD | |
parent | 68dc88e3f45d6cb33a56ca10ec02f7e990636d31 (diff) | |
parent | 0671250710c3e7312a4693ac45ebbaacf471d1dc (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
core/curl/PKGBUILD
core/lvm2/PKGBUILD
core/openvpn/PKGBUILD
extra/diffstat/PKGBUILD
extra/libxcb/PKGBUILD
extra/xorg-xkbutils/PKGBUILD
extra/xorg-xvinfo/PKGBUILD
Diffstat (limited to 'extra/networkmanager/PKGBUILD')
-rw-r--r-- | extra/networkmanager/PKGBUILD | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/extra/networkmanager/PKGBUILD b/extra/networkmanager/PKGBUILD index 570f544c0..6d99f897d 100644 --- a/extra/networkmanager/PKGBUILD +++ b/extra/networkmanager/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 169996 2012-10-30 23:01:16Z heftig $ +# $Id: PKGBUILD 177957 2013-02-12 12:13:58Z thomas $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Maintainer: Jan de Groot <jgc@archlinxu.org> # Contributor: Wael Nasreddine <gandalf@siemens-mobiles.org> @@ -9,7 +9,7 @@ pkgname=networkmanager _pkgname=NetworkManager pkgver=0.9.6.4 -pkgrel=1 +pkgrel=2 pkgdesc="Network Management daemon" arch=('i686' 'x86_64' 'mips64el') license=('GPL') |