Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=xorgtesting.git;a=commitdiff;h=0eb90e39689049fa17306b9a8e91f00bc7d6c62d

commit 0eb90e39689049fa17306b9a8e91f00bc7d6c62d
Merge: 7146ad1 9ec1c59
Author: Miklos Vajna <vmik...@frugalware.org>
Date:   Thu Jan 7 00:40:33 2010 +0100

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

* 'master' of git.frugalware.org:/pub/frugalware/frugalware-current: (561 
commits)

Conflicts:
source/lib-extra/flickcurl/FrugalBuild
source/x11-extra/nvidia-173xx/FrugalBuild
source/x11-extra/nvidia-96xx/FrugalBuild
source/x11-extra/nvidia/FrugalBuild

diff --cc source/x11-extra/nvidia-173xx/FrugalBuild
index eab7e69,9c8f949..1d28135
--- a/source/x11-extra/nvidia-173xx/FrugalBuild
+++ b/source/x11-extra/nvidia-173xx/FrugalBuild
@@@ -2,8 -2,8 +2,8 @@@
# Maintainer: Michel Hermier <herm...@frugalware.org>

pkgname=nvidia-173xx
-pkgver=173.14.20
-pkgrel=5
+pkgver=173.14.22
- pkgrel=2
++pkgrel=3
archs=('i686' 'x86_64' '!ppc')
_F_nvidia_legacyver="173.14.xx"
Finclude nvidia
diff --cc source/x11-extra/nvidia-96xx/FrugalBuild
index dbaa331,0fe37d7..9513fd5
--- a/source/x11-extra/nvidia-96xx/FrugalBuild
+++ b/source/x11-extra/nvidia-96xx/FrugalBuild
@@@ -2,8 -2,8 +2,8 @@@
# Maintainer: Michel Hermier <herm...@frugalware.org>

pkgname=nvidia-96xx
-pkgver=96.43.13
-pkgrel=5
+pkgver=96.43.14
- pkgrel=2
++pkgrel=3
archs=('i686' 'x86_64' '!ppc')
_F_nvidia_legacyver="96.43.xx"
Finclude nvidia
diff --cc source/x11-extra/nvidia/FrugalBuild
index 1395a6a,f1e4339..01a19c6
--- a/source/x11-extra/nvidia/FrugalBuild
+++ b/source/x11-extra/nvidia/FrugalBuild
@@@ -2,8 -2,8 +2,8 @@@
# Maintainer: Michel Hermier <herm...@frugalware.org>

pkgname=nvidia
-pkgver=185.18.36
-pkgrel=6
+pkgver=190.42
- pkgrel=2
++pkgrel=3
archs=('i686' 'x86_64' '!ppc')
Finclude nvidia
case "$_F_nvidia_arch" in
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to