Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=dex77stuff.git;a=commitdiff;h=3de419b3c770071b0226e9442d9274ebf41ebd17
commit 3de419b3c770071b0226e9442d9274ebf41ebd17 Author: kikadf <[email protected]> Date: Thu Feb 26 13:19:19 2015 +0100 Fix conflict in mediastreamer diff --git a/source/xlib/mediastreamer/FrugalBuild b/source/xlib/mediastreamer/FrugalBuild index 9fc999d..429a497 100644 --- a/source/xlib/mediastreamer/FrugalBuild +++ b/source/xlib/mediastreamer/FrugalBuild @@ -5,17 +5,10 @@ options+=('asneeded') pkgname=mediastreamer pkgver=2.10.0 -<<<<<<< HEAD pkgrel=3 pkgdesc="Library written in C that allows you to create and run audio and video streams." url="http://www.linphone.org/"; depends=('ortp>=0.22.0' 'ffmpeg>=2.5.4' 'libxv' 'glew>=1.10.0' 'libupnp' 'libpulse>=6.0') -======= -pkgrel=1 -pkgdesc="Library written in C that allows you to create and run audio and video streams." -url="http://www.linphone.org/"; -depends=('ortp>=0.22.0' 'ffmpeg' 'libxv' 'glew>=1.10.0' 'libupnp' 'libpulse>=6.0') ->>>>>>> 341de97fb84524accfccd92fe4920d9c75511903 makedepends=('intltool' 'vim') groups=('xlib') archs=('i686' 'x86_64') _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
