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 (1a6288fcc2b9ad27a17d6931559d522762640d8e)
- 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 (1a6288fcc2b9ad27a17d6931559d522762640d8e)
- Date: Wed, 28 Jan 2015 10:50:27 -0600
GIT changes to master z-rejected grimoire by Ladislav Hagara <hgr AT vabo.cz>:
z-kernels/nvidia_legacy_173xx/CONFLICTS | 3 ++-
z-kernels/nvidia_legacy_173xx/HISTORY | 3 +++
2 files changed, 5 insertions(+), 1 deletion(-)
New commits:
commit 1a6288fcc2b9ad27a17d6931559d522762640d8e
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
nvidia_legacy_173xx conflicts nvidia_legacy_340x
diff --git a/z-kernels/nvidia_legacy_173xx/CONFLICTS
b/z-kernels/nvidia_legacy_173xx/CONFLICTS
index 505f0b6..563bb0c 100755
--- a/z-kernels/nvidia_legacy_173xx/CONFLICTS
+++ b/z-kernels/nvidia_legacy_173xx/CONFLICTS
@@ -2,4 +2,5 @@ conflicts nvidia_driver &&
conflicts nvidia_legacy &&
conflicts nvidia_legacy_96xx &&
conflicts nvidia_legacy_295xx &&
-conflicts nvidia_legacy_304xx
+conflicts nvidia_legacy_304xx &&
+conflicts nvidia_legacy_340xx
diff --git a/z-kernels/nvidia_legacy_173xx/HISTORY
b/z-kernels/nvidia_legacy_173xx/HISTORY
index 2efa894..d1c7bfb 100644
--- a/z-kernels/nvidia_legacy_173xx/HISTORY
+++ b/z-kernels/nvidia_legacy_173xx/HISTORY
@@ -1,3 +1,6 @@
+2015-01-28 Ladislav Hagara <hgr AT vabo.cz>
+ * CONFLICTS: conflicts nvidia_legacy_340x
+
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 (1a6288fcc2b9ad27a17d6931559d522762640d8e), Ladislav Hagara, 01/28/2015
Archive powered by MHonArc 2.6.24.