Skip to Content.
Sympa Menu

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

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 (1d5c6237503a947b3231ac671e0e9b098870b018)
  • Date: Wed, 28 Jan 2015 10:49:02 -0600

GIT changes to master z-rejected grimoire by Ladislav Hagara <hgr AT vabo.cz>:

z-kernels/nvidia_legacy/CONFLICTS | 3 ++-
z-kernels/nvidia_legacy/HISTORY | 3 +++
2 files changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 1d5c6237503a947b3231ac671e0e9b098870b018
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

nvidia_legacy conflicts nvidia_legacy_340x

diff --git a/z-kernels/nvidia_legacy/CONFLICTS
b/z-kernels/nvidia_legacy/CONFLICTS
index 872ad7d..08c45c4 100755
--- a/z-kernels/nvidia_legacy/CONFLICTS
+++ b/z-kernels/nvidia_legacy/CONFLICTS
@@ -2,4 +2,5 @@ conflicts nvidia_driver &&
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_legacy/HISTORY b/z-kernels/nvidia_legacy/HISTORY
index 7ac5a45..1db8bb7 100644
--- a/z-kernels/nvidia_legacy/HISTORY
+++ b/z-kernels/nvidia_legacy/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: added nvidia_legacy_295xx and nvidia_legacy_304xx




  • [SM-Commit] GIT changes to master z-rejected grimoire by Ladislav Hagara (1d5c6237503a947b3231ac671e0e9b098870b018), Ladislav Hagara, 01/28/2015

Archive powered by MHonArc 2.6.24.

Top of Page