diff options
| author | Eric Sandall | 2008-03-18 00:16:07 -0700 |
|---|---|---|
| committer | Eric Sandall | 2008-03-18 00:16:07 -0700 |
| commit | d759bcc7f32eaed535084e60179e180ce447b6f2 (patch) | |
| tree | aba00346c67ba0a905abbd494defb5ba4a0018ae /xorg-font/font-bitstream-type1 | |
| parent | 25cccb7116fd16279f234a4528db60557aba9f33 (diff) | |
font-bitstream-type1: Auto-conflicts with xorg as well
Diffstat (limited to 'xorg-font/font-bitstream-type1')
| -rwxr-xr-x | xorg-font/font-bitstream-type1/CONFLICTS | 2 | ||||
| -rw-r--r-- | xorg-font/font-bitstream-type1/HISTORY | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/xorg-font/font-bitstream-type1/CONFLICTS b/xorg-font/font-bitstream-type1/CONFLICTS index 5d1493e9a0..8007c92eb4 100755 --- a/xorg-font/font-bitstream-type1/CONFLICTS +++ b/xorg-font/font-bitstream-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-bitstream-type1/HISTORY b/xorg-font/font-bitstream-type1/HISTORY index 4af0ba89f3..317a54b72a 100644 --- a/xorg-font/font-bitstream-type1/HISTORY +++ b/xorg-font/font-bitstream-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 |