summaryrefslogtreecommitdiffstats
path: root/xorg-util
diff options
context:
space:
mode:
authorEric Sandall2008-03-18 00:19:17 -0700
committerEric Sandall2008-03-18 00:19:17 -0700
commitdce440842f58056fc0d0eda8ac5714d87cb520d0 (patch)
treec6f07e5a9e76904856d10dbe03a5364c6b81bbff /xorg-util
parent4aacd4b32b004ab53bc86b6f386d6d50171076c6 (diff)
imake: Auto-conflicts with xorg as well
Diffstat (limited to 'xorg-util')
-rwxr-xr-xxorg-util/imake/CONFLICTS2
-rw-r--r--xorg-util/imake/HISTORY3
2 files changed, 4 insertions, 1 deletions
diff --git a/xorg-util/imake/CONFLICTS b/xorg-util/imake/CONFLICTS
index 5d1493e9a0..8007c92eb4 100755
--- a/xorg-util/imake/CONFLICTS
+++ b/xorg-util/imake/CONFLICTS
@@ -3,4 +3,4 @@ conflicts xfree86-devel y
conflicts xfree86-libs y
conflicts xfree86-4.3 y
conflicts xfree86 y
-conflicts xorg
+conflicts xorg y
diff --git a/xorg-util/imake/HISTORY b/xorg-util/imake/HISTORY
index 955d2e544b..995e24e2ee 100644
--- a/xorg-util/imake/HISTORY
+++ b/xorg-util/imake/HISTORY
@@ -1,3 +1,6 @@
+2008-03-17 Eric Sandall <sandalle@sourcemage.org>
+ * CONFLICTS: Auto-conflicts with xorg as well
+
2008-03-16 Eric Sandall <sandalle@sourcemage.org>
* CONFLICTS: Auto-conflicts with all prior monolithic X providers