diff options
| author | Eric Sandall | 2008-03-18 00:05:56 -0700 |
|---|---|---|
| committer | Eric Sandall | 2008-03-18 00:05:56 -0700 |
| commit | 86a58f538765dcd3d88469929b763f61694219ff (patch) | |
| tree | c1e80ee50966dd330021703acadb7a923dd5bcfd /xorg-util | |
| parent | 4a9f0f08e527f7adb4b8c41ed867644a94cc40e4 (diff) | |
util-macros: Auto-conflicts with xorg as well
Diffstat (limited to 'xorg-util')
| -rwxr-xr-x | xorg-util/util-macros/CONFLICTS | 2 | ||||
| -rw-r--r-- | xorg-util/util-macros/HISTORY | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/xorg-util/util-macros/CONFLICTS b/xorg-util/util-macros/CONFLICTS index 5d1493e9a0..8007c92eb4 100755 --- a/xorg-util/util-macros/CONFLICTS +++ b/xorg-util/util-macros/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/util-macros/HISTORY b/xorg-util/util-macros/HISTORY index 8e93ebd6d9..1008cef7ee 100644 --- a/xorg-util/util-macros/HISTORY +++ b/xorg-util/util-macros/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 |