[Frugalware-git] imgrebuild: Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current

[Miklos Vajna]

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=imgrebuild.git;a=commitdiff;h=f78d002e22f853062437ecabbd3d4419bc54c7be

commit f78d002e22f853062437ecabbd3d4419bc54c7be
Merge: 2325da0 868c6dd
Author: Miklos Vajna <vmiklos at frugalware.org>
Date:   Mon May 24 01:15:16 2010 +0200

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

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

Conflicts:
source/x11-extra/nvidia/FrugalBuild

diff --cc source/x11-extra/nvidia/FrugalBuild
index 4c168f0,3451653..60ce632
--- a/source/x11-extra/nvidia/FrugalBuild
+++ b/source/x11-extra/nvidia/FrugalBuild
@@@ -2,8 -2,8 +2,8 @@@
# Maintainer: Michel Hermier <hermier at frugalware.org>

pkgname=nvidia
-pkgver=195.36.15
-pkgrel=6
+pkgver=195.36.24
- pkgrel=2
++pkgrel=3
archs=('i686' 'x86_64' '!ppc')
Finclude nvidia
case "$_F_nvidia_arch" in