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 (a4364df9e5bef1978be85207a79c83c0e0a33e3a)
- 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 (a4364df9e5bef1978be85207a79c83c0e0a33e3a)
- Date: Wed, 28 Jan 2015 10:59:43 -0600
GIT changes to master z-rejected grimoire by Ladislav Hagara <hgr AT vabo.cz>:
z-kernels/nvidia_legacy_304xx/CONFLICTS | 3 ++-
z-kernels/nvidia_legacy_304xx/HISTORY | 3 +++
z-kernels/nvidia_legacy_96xx/CONFLICTS | 3 ++-
z-kernels/nvidia_legacy_96xx/HISTORY | 3 +++
4 files changed, 10 insertions(+), 2 deletions(-)
New commits:
commit a4364df9e5bef1978be85207a79c83c0e0a33e3a
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
nvidia_legacy_96xx conflicts nvidia_legacy_340xx
commit 368850c1a7924b47fe64907f0dbbb74c2cb00e31
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
nvidia_legacy_304xx conflicts nvidia_legacy_340xx
diff --git a/z-kernels/nvidia_legacy_304xx/CONFLICTS
b/z-kernels/nvidia_legacy_304xx/CONFLICTS
index 930ae25..d292680 100755
--- a/z-kernels/nvidia_legacy_304xx/CONFLICTS
+++ b/z-kernels/nvidia_legacy_304xx/CONFLICTS
@@ -2,4 +2,5 @@ conflicts nvidia_driver &&
conflicts nvidia_legacy &&
conflicts nvidia_legacy_96xx &&
conflicts nvidia_legacy_173xx &&
-conflicts nvidia_legacy_295xx
+conflicts nvidia_legacy_295xx &&
+conflicts nvidia_legacy_340xx
diff --git a/z-kernels/nvidia_legacy_304xx/HISTORY
b/z-kernels/nvidia_legacy_304xx/HISTORY
index 0ca369f..7a8abd9 100644
--- a/z-kernels/nvidia_legacy_304xx/HISTORY
+++ b/z-kernels/nvidia_legacy_304xx/HISTORY
@@ -1,3 +1,6 @@
+2015-01-28 Ladislav Hagara <hgr AT vabo.cz>
+ * CONFLICTS: conflicts nvidia_legacy_340xx
+
2014-10-25 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 304.123
diff --git a/z-kernels/nvidia_legacy_96xx/CONFLICTS
b/z-kernels/nvidia_legacy_96xx/CONFLICTS
index a01f48d..4987a85 100755
--- a/z-kernels/nvidia_legacy_96xx/CONFLICTS
+++ b/z-kernels/nvidia_legacy_96xx/CONFLICTS
@@ -2,4 +2,5 @@ conflicts nvidia_driver &&
conflicts nvidia_legacy &&
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_legacy_96xx/HISTORY
b/z-kernels/nvidia_legacy_96xx/HISTORY
index 5652c5e..2e4df5d 100644
--- a/z-kernels/nvidia_legacy_96xx/HISTORY
+++ b/z-kernels/nvidia_legacy_96xx/HISTORY
@@ -1,3 +1,6 @@
+2015-01-28 Ladislav Hagara <hgr AT vabo.cz>
+ * CONFLICTS: conflicts nvidia_legacy_340xx
+
2013-03-07 Vlad Glagolev <stealth AT sourcemage.org>
* CONFLICTS: conflicts nvidia_legacy_304xx
- [SM-Commit] GIT changes to master z-rejected grimoire by Ladislav Hagara (a4364df9e5bef1978be85207a79c83c0e0a33e3a), Ladislav Hagara, 01/28/2015
Archive powered by MHonArc 2.6.24.