Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=ryuotesting.git;a=commitdiff;h=9d09c08e50bf5fa135da0a49472dc8ba59f4aa2e

commit 9d09c08e50bf5fa135da0a49472dc8ba59f4aa2e
Author: Baste <[email protected]>
Date:   Mon Jan 2 09:41:40 2012 +0100

*fix conflict with current

diff --git a/source/gnome/empathy/FrugalBuild b/source/gnome/empathy/FrugalBuild
index 2dc07dc..b0bb20e 100644
--- a/source/gnome/empathy/FrugalBuild
+++ b/source/gnome/empathy/FrugalBuild
@@ -7,9 +7,8 @@ USE_SENDTO=${USE_SENDTO:-"n"}
#Sendto have be merged to nautilus should wait

pkgname=empathy
-<<<<<<< HEAD
pkgver=3.3.3
-pkgrel=2
+pkgrel=3
pkgdesc="Empathy consists of a rich set of reusable instant messaging widgets"
depends=('telepathy-glib>=0.17.3' 'libxml2' 'enchant' 'ca-certificates' \
'atk' 'pango' 'freetype2' 'libxau' 'libxdmcp' 'e2fsprogs' \
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to