diff options
| author | Eric Sandall | 2008-03-18 00:16:32 -0700 |
|---|---|---|
| committer | Eric Sandall | 2008-03-18 00:16:32 -0700 |
| commit | b6f9bd5503ff198c6c503e74cdfd146f540f02d0 (patch) | |
| tree | e2cf236968a210aa783ab09dde013eb83cbe9ff3 /xorg-font/font-screen-cyrillic | |
| parent | 755f132dac2e8a2b3a55a75afbe8651d2af73269 (diff) | |
font-screen-cyrillic: Auto-conflicts with xorg as well
Diffstat (limited to 'xorg-font/font-screen-cyrillic')
| -rwxr-xr-x | xorg-font/font-screen-cyrillic/CONFLICTS | 2 | ||||
| -rw-r--r-- | xorg-font/font-screen-cyrillic/HISTORY | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/xorg-font/font-screen-cyrillic/CONFLICTS b/xorg-font/font-screen-cyrillic/CONFLICTS index 5d1493e9a0..8007c92eb4 100755 --- a/xorg-font/font-screen-cyrillic/CONFLICTS +++ b/xorg-font/font-screen-cyrillic/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-screen-cyrillic/HISTORY b/xorg-font/font-screen-cyrillic/HISTORY index aa4a0d1501..b017cbfbb0 100644 --- a/xorg-font/font-screen-cyrillic/HISTORY +++ b/xorg-font/font-screen-cyrillic/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 |