Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master z-rejected grimoire by Ladislav Hagara (5622cd4ae8266ded888496be8ede2a7f2ea63313)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ladislav Hagara <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master z-rejected grimoire by Ladislav Hagara (5622cd4ae8266ded888496be8ede2a7f2ea63313)
  • Date: Thu, 9 Oct 2008 18:51:49 -0500

GIT changes to master z-rejected grimoire by Ladislav Hagara
<ladislav.hagara AT unob.cz>:

z-kernels/nvidia_driver/CONFLICTS | 3 ++-
z-kernels/nvidia_driver/HISTORY | 3 +++
z-kernels/nvidia_legacy/CONFLICTS | 3 ++-
z-kernels/nvidia_legacy/HISTORY | 3 +++
z-kernels/nvidia_legacy_173xx/CONFLICTS | 3 ++-
z-kernels/nvidia_legacy_173xx/HISTORY | 3 +++
z-kernels/nvidia_legacy_96xx/CONFLICTS | 3 ++-
z-kernels/nvidia_legacy_96xx/HISTORY | 3 +++
8 files changed, 20 insertions(+), 4 deletions(-)

New commits:
commit 5622cd4ae8266ded888496be8ede2a7f2ea63313
Author: Ladislav Hagara <ladislav.hagara AT unob.cz>
Commit: Ladislav Hagara <ladislav.hagara AT unob.cz>

nvidia_legacy_173xx: CONFLICTS updated

commit 6e7e3885e61c2d912ec855b4688b09bb4e87c824
Author: Ladislav Hagara <ladislav.hagara AT unob.cz>
Commit: Ladislav Hagara <ladislav.hagara AT unob.cz>

nvidia_legacy_96xx: CONFLICTS updated

commit 5459b24a8f65c7df8e7b495250b15fd90083d3f5
Author: Ladislav Hagara <ladislav.hagara AT unob.cz>
Commit: Ladislav Hagara <ladislav.hagara AT unob.cz>

nvidia_legacy: updated CONFLICTS

commit 585532793ccc9fc504f91aabb68aca2830111737
Author: Ladislav Hagara <ladislav.hagara AT unob.cz>
Commit: Ladislav Hagara <ladislav.hagara AT unob.cz>

nvidia_driver: updated CONFLICTS

diff --git a/z-kernels/nvidia_driver/CONFLICTS
b/z-kernels/nvidia_driver/CONFLICTS
index 4b779b2..147c177 100755
--- a/z-kernels/nvidia_driver/CONFLICTS
+++ b/z-kernels/nvidia_driver/CONFLICTS
@@ -1,2 +1,3 @@
conflicts nvidia_legacy &&
-conflicts nvidia-settings y
+conflicts nvidia_legacy_96xx &&
+conflicts nvidia_legacy_173xx
diff --git a/z-kernels/nvidia_driver/HISTORY b/z-kernels/nvidia_driver/HISTORY
index dc1a5af..423cbb5 100644
--- a/z-kernels/nvidia_driver/HISTORY
+++ b/z-kernels/nvidia_driver/HISTORY
@@ -1,3 +1,6 @@
+2008-10-10 Ladislav Hagara <hgr AT vabo.cz>
+ * CONFLICTS: updated
+
2008-10-07 Julien "_kaze_" ROZO <julien AT rozo.org>
* DETAILS: updated stable version to 177.80

diff --git a/z-kernels/nvidia_legacy/CONFLICTS
b/z-kernels/nvidia_legacy/CONFLICTS
index d770712..4db3a3a 100755
--- a/z-kernels/nvidia_legacy/CONFLICTS
+++ b/z-kernels/nvidia_legacy/CONFLICTS
@@ -1,2 +1,3 @@
conflicts nvidia_driver &&
-conflicts nvidia-settings y
+conflicts nvidia_legacy_96xx &&
+conflicts nvidia_legacy_173xx
diff --git a/z-kernels/nvidia_legacy/HISTORY b/z-kernels/nvidia_legacy/HISTORY
index b539c7f..ecb82bb 100644
--- a/z-kernels/nvidia_legacy/HISTORY
+++ b/z-kernels/nvidia_legacy/HISTORY
@@ -1,3 +1,6 @@
+2008-10-10 Ladislav Hagara <hgr AT vabo.cz>
+ * CONFLICTS: updated
+
2008-04-24 Eric Sandall <sandalle AT sourcemage.org>
* DEPENDS: Removed dependency on mktemp (now provided by coreutils)

diff --git a/z-kernels/nvidia_legacy_173xx/CONFLICTS
b/z-kernels/nvidia_legacy_173xx/CONFLICTS
index 4b779b2..2be8aae 100755
--- a/z-kernels/nvidia_legacy_173xx/CONFLICTS
+++ b/z-kernels/nvidia_legacy_173xx/CONFLICTS
@@ -1,2 +1,3 @@
+conflicts nvidia_driver &&
conflicts nvidia_legacy &&
-conflicts nvidia-settings y
+conflicts nvidia_legacy_96xx
diff --git a/z-kernels/nvidia_legacy_173xx/HISTORY
b/z-kernels/nvidia_legacy_173xx/HISTORY
index d07a56c..c49d585 100644
--- a/z-kernels/nvidia_legacy_173xx/HISTORY
+++ b/z-kernels/nvidia_legacy_173xx/HISTORY
@@ -1,3 +1,6 @@
+2008-10-10 Ladislav Hagara <hgr AT vabo.cz>
+ * CONFLICTS: updated
+
2008-10-08 Julien "_kaze_" ROZO <julien AT rozo.org>
* ALL: branched from nvidia_driver at version 173.14.12,
last driver to support GeForceFX GPU
diff --git a/z-kernels/nvidia_legacy_96xx/CONFLICTS
b/z-kernels/nvidia_legacy_96xx/CONFLICTS
index d770712..1a2a050 100755
--- a/z-kernels/nvidia_legacy_96xx/CONFLICTS
+++ b/z-kernels/nvidia_legacy_96xx/CONFLICTS
@@ -1,2 +1,3 @@
conflicts nvidia_driver &&
-conflicts nvidia-settings y
+conflicts nvidia_legacy &&
+conflicts nvidia_legacy_173xx
diff --git a/z-kernels/nvidia_legacy_96xx/HISTORY
b/z-kernels/nvidia_legacy_96xx/HISTORY
index a4755f9..c3ae728 100644
--- a/z-kernels/nvidia_legacy_96xx/HISTORY
+++ b/z-kernels/nvidia_legacy_96xx/HISTORY
@@ -1,3 +1,6 @@
+2008-10-10 Ladislav Hagara <hgr AT vabo.cz>
+ * CONFLICTS: updated
+
2008-04-24 Eric Sandall <sandalle AT sourcemage.org>
* DEPENDS: Removed dependency on mktemp (now provided by coreutils)




  • [SM-Commit] GIT changes to master z-rejected grimoire by Ladislav Hagara (5622cd4ae8266ded888496be8ede2a7f2ea63313), Ladislav Hagara, 10/09/2008

Archive powered by MHonArc 2.6.24.

Top of Page