Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=gnometesting.git;a=commitdiff;h=085a5c0463a75a1e816836eeb137d315aee34ba9

commit 085a5c0463a75a1e816836eeb137d315aee34ba9
Merge: 8d69d83 7e7e962
Author: bouleetbil <bouleet...@frogdev.info>
Date:   Wed Sep 28 11:12:06 2011 +0200

Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current

Conflicts:
source/gnome/gnome-frugalware/FrugalBuild

diff --cc source/xlib/xscreensaver/FrugalBuild
index 0a391c9,923a1ba..1755c74
--- a/source/xlib/xscreensaver/FrugalBuild
+++ b/source/xlib/xscreensaver/FrugalBuild
@@@ -1,9 -1,9 +1,9 @@@
# Compiling Time: 1.65 SBU
# Maintainer: bouleetbil <bouleet...@frogdev.info>
- # Contributor: VMiklos <vmik...@frugalware.org>
+ # Contributor: Miklos Vajna <vmik...@frugalware.org>

pkgname=xscreensaver
-pkgver=5.12
+pkgver=5.14
pkgrel=1
pkgdesc="A screen saver and locker for the X Window System."
url="http://www.jwz.org/xscreensaver";
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to