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