sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Eric Sandall (3ee0a2363c091edcc148d24d04e493f816511b12)

From: Eric Sandall <scm AT sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to master grimoire by Eric Sandall (3ee0a2363c091edcc148d24d04e493f816511b12)
Date: Tue, 7 Jan 2020 20:14:58 +0000

GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:

xorg/xserver/CONFLICTS | 2 +-
xorg/xserver/HISTORY | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 3ee0a2363c091edcc148d24d04e493f816511b12
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

xserver: Auto-conflicts (e.g. spell deprecations) default to 'y'

diff --git a/xorg/xserver/CONFLICTS b/xorg/xserver/CONFLICTS
index 39994f5..9f7a173 100755
--- a/xorg/xserver/CONFLICTS
+++ b/xorg/xserver/CONFLICTS
@@ -1,3 +1,3 @@
conflicts glamor y &&
conflicts xf86-video-modesetting y &&
-conflicts xorg-server n
+conflicts xorg-server y
diff --git a/xorg/xserver/HISTORY b/xorg/xserver/HISTORY
index 1d17d07..648b0f3 100644
--- a/xorg/xserver/HISTORY
+++ b/xorg/xserver/HISTORY
@@ -1,3 +1,6 @@
+2020-01-07 Eric Sandall <sandalle AT sourcemage.org>
+ * CONFLICTS: Auto-conflicts (e.g. spell deprecations) default to 'y'
+
2019-11-23 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.20.6

[SM-Commit] GIT changes to master grimoire by Eric Sandall (3ee0a2363c091edcc148d24d04e493f816511b12), Eric Sandall, 01/07/2020