sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to master grimoire by Eric Sandall (e8b0fb155a0594a6090376bfaf60ea892c5c331f)
- 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 (e8b0fb155a0594a6090376bfaf60ea892c5c331f)
- Date: Tue, 7 Jan 2020 18:44:48 +0000
GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:
graphics-libs/mesa/CONFLICTS | 2 +-
graphics-libs/mesa/HISTORY | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit e8b0fb155a0594a6090376bfaf60ea892c5c331f
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>
mesa: Auto-conflicts default to "y" to avoid interrupting upgrades/casts
diff --git a/graphics-libs/mesa/CONFLICTS b/graphics-libs/mesa/CONFLICTS
index 3455744..19d6b48 100755
--- a/graphics-libs/mesa/CONFLICTS
+++ b/graphics-libs/mesa/CONFLICTS
@@ -1 +1 @@
-conflicts mesalib n
+conflicts mesalib y
diff --git a/graphics-libs/mesa/HISTORY b/graphics-libs/mesa/HISTORY
index 8d73fff..9833a52 100644
--- a/graphics-libs/mesa/HISTORY
+++ b/graphics-libs/mesa/HISTORY
@@ -1,4 +1,7 @@
-2002-01-05 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+2020-01-07 Eric Sandall <sandalle AT sourcemage.org>
+ * CONFLICTS: Auto-conflicts default to "y" to avoid interrupting
upgrades/casts.
+
+2020-01-05 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* patches/0001-install-GL-headers-in-.mesa.patch: regenerate patch
2019-12-18 Pavel Vinogradov <public AT sourcemage.org>
- [SM-Commit] GIT changes to master grimoire by Eric Sandall (e8b0fb155a0594a6090376bfaf60ea892c5c331f), Eric Sandall, 01/07/2020
Archive powered by MHonArc 2.6.24.