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