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