summaryrefslogtreecommitdiffstats
path: root/xorg-font/font-bh-lucidatypewriter-100dpi
diff options
context:
space:
mode:
authorEric Sandall2008-03-18 00:15:55 -0700
committerEric Sandall2008-03-18 00:15:55 -0700
commitf3ffd2f352959cefcf1ab66e490981fe5cdecf1c (patch)
tree5a94129c189bad42a42daa67a8aefc9c4408813a /xorg-font/font-bh-lucidatypewriter-100dpi
parent53a092a62f477ede5e5f750bec79c07ead8fefc4 (diff)
font-bh-lucidatypewriter-100dpi: Auto-conflicts with xorg as well
Diffstat (limited to 'xorg-font/font-bh-lucidatypewriter-100dpi')
-rwxr-xr-xxorg-font/font-bh-lucidatypewriter-100dpi/CONFLICTS2
-rw-r--r--xorg-font/font-bh-lucidatypewriter-100dpi/HISTORY3
2 files changed, 4 insertions, 1 deletions
diff --git a/xorg-font/font-bh-lucidatypewriter-100dpi/CONFLICTS b/xorg-font/font-bh-lucidatypewriter-100dpi/CONFLICTS
index 5d1493e9a0..8007c92eb4 100755
--- a/xorg-font/font-bh-lucidatypewriter-100dpi/CONFLICTS
+++ b/xorg-font/font-bh-lucidatypewriter-100dpi/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-bh-lucidatypewriter-100dpi/HISTORY b/xorg-font/font-bh-lucidatypewriter-100dpi/HISTORY
index f9f34d2e83..fafd379806 100644
--- a/xorg-font/font-bh-lucidatypewriter-100dpi/HISTORY
+++ b/xorg-font/font-bh-lucidatypewriter-100dpi/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