diff options
| author | Eric Sandall | 2008-03-18 00:13:29 -0700 |
|---|---|---|
| committer | Eric Sandall | 2008-03-18 00:13:29 -0700 |
| commit | 31c08a9ff535757d10d56734e2756ea7bf11a89c (patch) | |
| tree | 127eebec6d3bfc0a6647295ccc7f05e33c6863e6 /xorg-doc | |
| parent | 634f5f79d2cac70d8c863fad898dd2abefc41760 (diff) | |
xorg-docs: Auto-conflicts with xorg as well
Diffstat (limited to 'xorg-doc')
| -rwxr-xr-x | xorg-doc/xorg-docs/CONFLICTS | 2 | ||||
| -rw-r--r-- | xorg-doc/xorg-docs/HISTORY | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/xorg-doc/xorg-docs/CONFLICTS b/xorg-doc/xorg-docs/CONFLICTS index 5d1493e9a0..8007c92eb4 100755 --- a/xorg-doc/xorg-docs/CONFLICTS +++ b/xorg-doc/xorg-docs/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-doc/xorg-docs/HISTORY b/xorg-doc/xorg-docs/HISTORY index 7fc83880a3..d2b1431816 100644 --- a/xorg-doc/xorg-docs/HISTORY +++ b/xorg-doc/xorg-docs/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 |