Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=dex77stuff.git;a=commitdiff;h=b5fff629e8253fff733f940f6aae32f2bde42844

commit b5fff629e8253fff733f940f6aae32f2bde42844
Author: kikadf <[email protected]>
Date:   Sun Dec 28 16:10:08 2014 +0100

baresip-0.4.12-2-x86_64

* Version bump (in kikadftesting)

diff --git a/source/network-extra/baresip/FrugalBuild 
b/source/network-extra/baresip/FrugalBuild
index 3407910..8022621 100644
--- a/source/network-extra/baresip/FrugalBuild
+++ b/source/network-extra/baresip/FrugalBuild
@@ -4,13 +4,8 @@
options+=('asneeded')

pkgname=baresip
-<<<<<<< HEAD
-pkgver=0.4.11
-pkgrel=2
-=======
pkgver=0.4.12
-pkgrel=1
->>>>>>> 87068f53930747fdfaab382f2149309f6c90e5bd
+pkgrel=2
pkgdesc="A portable and modular SIP User-Agent with audio and video support"
url="http://www.creytiv.com";
depends=('librem>=0.4.3' 'gstreamer' 'ffmpeg>=2.5.1' 'mpg123' 'celt' 
'portaudio' \
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to