sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Jaka Kranjc (3d4263206d153f05ed72f3b1ad1e6ae0266a437a)

From: Jaka Kranjc <scm AT sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to master grimoire by Jaka Kranjc (3d4263206d153f05ed72f3b1ad1e6ae0266a437a)
Date: Sat, 30 Aug 2008 06:41:54 -0500

GIT changes to master grimoire by Jaka Kranjc <lynxlynxlynx AT sourcemage.org>:

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

New commits:
commit 3d4263206d153f05ed72f3b1ad1e6ae0266a437a
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

xkbdata: fixed conflict

diff --git a/xorg-data/xkbdata/CONFLICTS b/xorg-data/xkbdata/CONFLICTS
index 6adc7ae..8007c92 100755
--- a/xorg-data/xkbdata/CONFLICTS
+++ b/xorg-data/xkbdata/CONFLICTS
@@ -1,4 +1,3 @@
-conflicts xkeyboard-config
conflicts xdirectfb y
conflicts xfree86-devel y
conflicts xfree86-libs y
diff --git a/xorg-data/xkbdata/HISTORY b/xorg-data/xkbdata/HISTORY
index 14ed037..aacc822 100644
--- a/xorg-data/xkbdata/HISTORY
+++ b/xorg-data/xkbdata/HISTORY
@@ -1,3 +1,6 @@
+2008-08-30 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * CONFLICTS: don't conflict with xkeyboard-config, you depend on it
+
2008-03-17 Eric Sandall <sandalle AT sourcemage.org>
* CONFLICTS: Auto-conflicts with xorg as well

[SM-Commit] GIT changes to master grimoire by Jaka Kranjc (3d4263206d153f05ed72f3b1ad1e6ae0266a437a), Jaka Kranjc, 08/30/2008