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