diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2011-12-04 14:32:45 +0100 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2011-12-04 14:32:45 +0100 |
commit | 03346d9676b006b2ba496a44d56f3efccc185d6a (patch) | |
tree | 3e6c51e16a4f6c2b64c5109af508539d54455d9a /community/twinkle | |
parent | 61c0d1ec341c4979f7722696d3b7e6a958f81b10 (diff) | |
parent | 851376cd7720e1f9b35e0a7c26bfd66399f0c4d3 (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/gnash/PKGBUILD
community/python-pymongo/PKGBUILD
extra/boost/PKGBUILD
extra/liborigin2/PKGBUILD
extra/libpst/PKGBUILD
extra/lyx/PKGBUILD
extra/mkvtoolnix/PKGBUILD
multilib/wine/PKGBUILD
Diffstat (limited to 'community/twinkle')
-rw-r--r-- | community/twinkle/PKGBUILD | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/community/twinkle/PKGBUILD b/community/twinkle/PKGBUILD index 0032df664..850dad358 100644 --- a/community/twinkle/PKGBUILD +++ b/community/twinkle/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 52444 2011-07-25 19:31:08Z jelle $ +# $Id: PKGBUILD 59974 2011-12-02 21:01:27Z ibiru $ # Maintainer: # Contributor: Jeff Mickey <jeff@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> @@ -6,7 +6,7 @@ pkgname=twinkle pkgver=1.4.2 -pkgrel=11 +pkgrel=12 pkgdesc="A softphone for voice over IP and instant messaging communications using the SIP protocol" arch=('i686' 'x86_64' 'mips64el') url="http://www.twinklephone.com/" |