diff options
| author | Eric Sandall | 2008-03-18 00:19:19 -0700 |
|---|---|---|
| committer | Eric Sandall | 2008-03-18 00:19:19 -0700 |
| commit | e386d697c6b439d4ac13d20768af5efb5e0046e1 (patch) | |
| tree | c9e2d4de1c0f2ff60643d28bde2bb65aae6d5e1f /xorg-util | |
| parent | dce440842f58056fc0d0eda8ac5714d87cb520d0 (diff) | |
lndir: Auto-conflicts with xorg as well
Diffstat (limited to 'xorg-util')
| -rwxr-xr-x | xorg-util/lndir/CONFLICTS | 2 | ||||
| -rw-r--r-- | xorg-util/lndir/HISTORY | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/xorg-util/lndir/CONFLICTS b/xorg-util/lndir/CONFLICTS index 5d1493e9a0..8007c92eb4 100755 --- a/xorg-util/lndir/CONFLICTS +++ b/xorg-util/lndir/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-util/lndir/HISTORY b/xorg-util/lndir/HISTORY index ceb9f477d9..c6abedc194 100644 --- a/xorg-util/lndir/HISTORY +++ b/xorg-util/lndir/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 |