diff options
author | Eric Sandall | 2008-03-18 00:15:45 -0700 |
---|---|---|
committer | Eric Sandall | 2008-03-18 00:15:45 -0700 |
commit | 7e8572f81d7a773a68e394acc9871476ecedbb29 (patch) | |
tree | 2f73dc569944ce247a2a3dbcd316af86498cd3bc /xorg-font/font-adobe-utopia-type1 | |
parent | 8efbb8e67f9e5d64403606b90eab2b9b315959d3 (diff) |
font-adobe-utopia-type1: Auto-conflicts with xorg as well
Diffstat (limited to 'xorg-font/font-adobe-utopia-type1')
-rwxr-xr-x | xorg-font/font-adobe-utopia-type1/CONFLICTS | 2 | ||||
-rw-r--r-- | xorg-font/font-adobe-utopia-type1/HISTORY | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/xorg-font/font-adobe-utopia-type1/CONFLICTS b/xorg-font/font-adobe-utopia-type1/CONFLICTS index 5d1493e9a0..8007c92eb4 100755 --- a/xorg-font/font-adobe-utopia-type1/CONFLICTS +++ b/xorg-font/font-adobe-utopia-type1/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-adobe-utopia-type1/HISTORY b/xorg-font/font-adobe-utopia-type1/HISTORY index 1c6b2f8799..0ffe232522 100644 --- a/xorg-font/font-adobe-utopia-type1/HISTORY +++ b/xorg-font/font-adobe-utopia-type1/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 |