summaryrefslogtreecommitdiffstats
path: root/xorg-font/font-jis-misc
diff options
context:
space:
mode:
authorEric Sandall2008-03-18 00:16:18 -0700
committerEric Sandall2008-03-18 00:16:18 -0700
commit6ffd0e7b1ecc97aa4c03af58814dabc52675c661 (patch)
tree780e69ad02e5c90c2b2c712aa883e2ec6b0bf95a /xorg-font/font-jis-misc
parent4c12e907453984cd57f50c90316a1a3a1827b182 (diff)
font-jis-misc: Auto-conflicts with xorg as well
Diffstat (limited to 'xorg-font/font-jis-misc')
-rwxr-xr-xxorg-font/font-jis-misc/CONFLICTS2
-rw-r--r--xorg-font/font-jis-misc/HISTORY3
2 files changed, 4 insertions, 1 deletions
diff --git a/xorg-font/font-jis-misc/CONFLICTS b/xorg-font/font-jis-misc/CONFLICTS
index 5d1493e9a0..8007c92eb4 100755
--- a/xorg-font/font-jis-misc/CONFLICTS
+++ b/xorg-font/font-jis-misc/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-font/font-jis-misc/HISTORY b/xorg-font/font-jis-misc/HISTORY
index 130aba8ca3..75021fbf74 100644
--- a/xorg-font/font-jis-misc/HISTORY
+++ b/xorg-font/font-jis-misc/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