diff options
| author | Eric Sandall | 2008-03-18 00:16:03 -0700 |
|---|---|---|
| committer | Eric Sandall | 2008-03-18 00:16:03 -0700 |
| commit | ce3429c55b0b653c10fed3a69c8b974579ad4439 (patch) | |
| tree | 617544ddf8623658d07ba11e93a2a83d6441a089 /xorg-font/font-bitstream-75dpi | |
| parent | f61c1e9e575ce95988c7ac208d5312605d3e97cf (diff) | |
font-bitstream-75dpi: Auto-conflicts with xorg as well
Diffstat (limited to 'xorg-font/font-bitstream-75dpi')
| -rwxr-xr-x | xorg-font/font-bitstream-75dpi/CONFLICTS | 2 | ||||
| -rw-r--r-- | xorg-font/font-bitstream-75dpi/HISTORY | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/xorg-font/font-bitstream-75dpi/CONFLICTS b/xorg-font/font-bitstream-75dpi/CONFLICTS index 5d1493e9a0..8007c92eb4 100755 --- a/xorg-font/font-bitstream-75dpi/CONFLICTS +++ b/xorg-font/font-bitstream-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-bitstream-75dpi/HISTORY b/xorg-font/font-bitstream-75dpi/HISTORY index 130aba8ca3..75021fbf74 100644 --- a/xorg-font/font-bitstream-75dpi/HISTORY +++ b/xorg-font/font-bitstream-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 |