diff options
| author | Eric Sandall | 2008-03-18 00:19:15 -0700 |
|---|---|---|
| committer | Eric Sandall | 2008-03-18 00:19:15 -0700 |
| commit | 4aacd4b32b004ab53bc86b6f386d6d50171076c6 (patch) | |
| tree | 08d8952a32680411260a87d871a16ef8f595a5a3 /xorg-util | |
| parent | 832d42b727909e770a7cb07cbc539bec90e63a21 (diff) | |
gccmakedep: Auto-conflicts with xorg as well
Diffstat (limited to 'xorg-util')
| -rwxr-xr-x | xorg-util/gccmakedep/CONFLICTS | 2 | ||||
| -rw-r--r-- | xorg-util/gccmakedep/HISTORY | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/xorg-util/gccmakedep/CONFLICTS b/xorg-util/gccmakedep/CONFLICTS index 5d1493e9a0..8007c92eb4 100755 --- a/xorg-util/gccmakedep/CONFLICTS +++ b/xorg-util/gccmakedep/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/gccmakedep/HISTORY b/xorg-util/gccmakedep/HISTORY index 478e3eace9..8bb8c56900 100644 --- a/xorg-util/gccmakedep/HISTORY +++ b/xorg-util/gccmakedep/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 |