Source Mage code commit list

[Ladislav Hagara <scm AT sourcemage.org>]

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

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

New commits:
commit 17ebeb5477b87804de9266236c70d7cec5994b7b
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

    nvidia_legacy_295xx conflicts nvidia_legacy_340x

diff --git a/z-kernels/nvidia_legacy_295xx/CONFLICTS 
b/z-kernels/nvidia_legacy_295xx/CONFLICTS
index f7e60bb..b24735e 100755
--- a/z-kernels/nvidia_legacy_295xx/CONFLICTS
+++ b/z-kernels/nvidia_legacy_295xx/CONFLICTS
@@ -2,4 +2,5 @@ conflicts nvidia_driver &&
 conflicts nvidia_legacy &&
 conflicts nvidia_legacy_96xx &&
 conflicts nvidia_legacy_173xx &&
-conflicts nvidia_legacy_304xx
+conflicts nvidia_legacy_304xx &&
+conflicts nvidia_legacy_340xx
diff --git a/z-kernels/nvidia_legacy_295xx/HISTORY 
b/z-kernels/nvidia_legacy_295xx/HISTORY
index f64e8a2..1df0a8a 100644
--- a/z-kernels/nvidia_legacy_295xx/HISTORY
+++ b/z-kernels/nvidia_legacy_295xx/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: added nvidia_legacy_304xx