sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to master z-rejected grimoire by Ladislav Hagara (3519acfa3416150953d16a306bb5c78c581542ba)
- 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 (3519acfa3416150953d16a306bb5c78c581542ba)
- Date: Wed, 28 Jan 2015 10:44:15 -0600
GIT changes to master z-rejected grimoire by Ladislav Hagara <hgr AT vabo.cz>:
z-kernels/nvidia_driver/CONFLICTS | 3 ++-
z-kernels/nvidia_driver/HISTORY | 3 +++
2 files changed, 5 insertions(+), 1 deletion(-)
New commits:
commit 3519acfa3416150953d16a306bb5c78c581542ba
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
nvidia_driver conflicts nvidia_legacy_340xx
diff --git a/z-kernels/nvidia_driver/CONFLICTS
b/z-kernels/nvidia_driver/CONFLICTS
index d2cbe33..8b0c723 100755
--- a/z-kernels/nvidia_driver/CONFLICTS
+++ b/z-kernels/nvidia_driver/CONFLICTS
@@ -2,4 +2,5 @@ conflicts nvidia_legacy &&
conflicts nvidia_legacy_96xx &&
conflicts nvidia_legacy_173xx &&
conflicts nvidia_legacy_295xx &&
-conflicts nvidia_legacy_304xx
+conflicts nvidia_legacy_304xx &&
+conflicts nvidia_legacy_340xx
diff --git a/z-kernels/nvidia_driver/HISTORY b/z-kernels/nvidia_driver/HISTORY
index 22100f0..5b8ab02 100644
--- a/z-kernels/nvidia_driver/HISTORY
+++ b/z-kernels/nvidia_driver/HISTORY
@@ -1,3 +1,6 @@
+2015-01-28 Ladislav Hagara <hgr AT vabo.cz>
+ * CONFLICTS: conflicts nvidia_legacy_340xx
+
2014-12-08 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 340.65
- [SM-Commit] GIT changes to master z-rejected grimoire by Ladislav Hagara (3519acfa3416150953d16a306bb5c78c581542ba), Ladislav Hagara, 01/28/2015
Archive powered by MHonArc 2.6.24.