Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=ryuotesting.git;a=commitdiff;h=73512e92de7127aedb7dc60ac750f15f7c07ac72
commit 73512e92de7127aedb7dc60ac750f15f7c07ac72 Author: Baste <[email protected]> Date: Thu Jan 5 15:53:27 2012 +0100 * Fix conflict diff --git a/source/gnome/empathy/FrugalBuild b/source/gnome/empathy/FrugalBuild index 1c325dc..c077189 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=4 +pkgrel=5 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
