diff options
| author | Eric Sandall | 2008-03-18 00:13:27 -0700 |
|---|---|---|
| committer | Eric Sandall | 2008-03-18 00:13:27 -0700 |
| commit | 634f5f79d2cac70d8c863fad898dd2abefc41760 (patch) | |
| tree | 44f8990d66b93c58a70abbb769f5be99bc6b773a /xorg-data | |
| parent | 5058ca4e56f9aa7f00308f95a9ee2f86f39283d8 (diff) | |
xorg-data-profile: Auto-conflicts with xorg as well
Diffstat (limited to 'xorg-data')
| -rwxr-xr-x | xorg-data/xorg-data-profile/CONFLICTS | 2 | ||||
| -rw-r--r-- | xorg-data/xorg-data-profile/HISTORY | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/xorg-data/xorg-data-profile/CONFLICTS b/xorg-data/xorg-data-profile/CONFLICTS index 5d1493e9a0..8007c92eb4 100755 --- a/xorg-data/xorg-data-profile/CONFLICTS +++ b/xorg-data/xorg-data-profile/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-data/xorg-data-profile/HISTORY b/xorg-data/xorg-data-profile/HISTORY index ce34c86561..296a1578dd 100644 --- a/xorg-data/xorg-data-profile/HISTORY +++ b/xorg-data/xorg-data-profile/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: xfree86-lib -> xfree86-libs xfree86-43 -> xfree86-4.3 |