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

commit 9cd7815f8a873477fb507dfc63fcf2c37ab8a313
Author: Baste <[email protected]>
Date:   Mon Jan 2 09:42:42 2012 +0100

*fix conflict with current

diff --git a/source/gnome/gnome-control-center/FrugalBuild 
b/source/gnome/gnome-control-center/FrugalBuild
index 4d9ce31..4be27c4 100644
--- a/source/gnome/gnome-control-center/FrugalBuild
+++ b/source/gnome/gnome-control-center/FrugalBuild
@@ -4,9 +4,8 @@
USE_CHEESE=${USE_CHEESE:-"y"}

pkgname=gnome-control-center
-<<<<<<< HEAD
pkgver=3.3.2
-pkgrel=2
+pkgrel=3
pkgdesc="GNOME Control Center"
depends=('libxml2>=2.7.8' 'gnome-desktop>=3.2.1' 'mutter' 'libgnomekbd>=3.0.0' 
'gnome-menus' \
'nautilus>=3.2.0' 'gst-plugins-base>=0.10.19-2' 'desktop-file-utils' \
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to