New commits:
commit c201de6aed0e1080683b79eae95813f545aa653e
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>
xkeyboard-config: Didn't mean to remove the conflict against xkbdata
commit ee6fc3668dea469818fe1dc572375f9660ed6c8e
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>
xf86-video-via: Didn't mean to remove the conflict against
xf86-video-openchrome
commit 18c4b9de04960f1f7641371f5d65f8357e5fca7d
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>
xf86-video-openchrome: Didn't mean to remove the conflict against
xf86-video-via
diff --git a/xorg-data/xkeyboard-config/CONFLICTS
b/xorg-data/xkeyboard-config/CONFLICTS
new file mode 100755
index 0000000..61c053f
--- /dev/null
+++ b/xorg-data/xkeyboard-config/CONFLICTS
@@ -0,0 +1 @@
+conflicts xkbdata
diff --git a/xorg-driver/xf86-video-openchrome/CONFLICTS
b/xorg-driver/xf86-video-openchrome/CONFLICTS
new file mode 100755
index 0000000..b4cdf5a
--- /dev/null
+++ b/xorg-driver/xf86-video-openchrome/CONFLICTS
@@ -0,0 +1 @@
+conflicts xf86-video-via
diff --git a/xorg-driver/xf86-video-via/CONFLICTS
b/xorg-driver/xf86-video-via/CONFLICTS
new file mode 100755
index 0000000..b57250d
--- /dev/null
+++ b/xorg-driver/xf86-video-via/CONFLICTS
@@ -0,0 +1 @@
+conflicts xf86-video-openchrome
[SM-Commit] GIT changes to master grimoire by Eric Sandall (c201de6aed0e1080683b79eae95813f545aa653e),
Eric Sandall, 04/06/2010