diff options
| author | Eric Sandall | 2008-03-18 00:13:26 -0700 |
|---|---|---|
| committer | Eric Sandall | 2008-03-18 00:13:26 -0700 |
| commit | 5058ca4e56f9aa7f00308f95a9ee2f86f39283d8 (patch) | |
| tree | 796c644c2cf6e1bd0e3dc4e65946026f8eee5a84 /xorg-data | |
| parent | 9dd695abac6a52d1300f9d57f082ef4e4f83a802 (diff) | |
xkeyboard-config: Auto-conflicts with xorg as well
Diffstat (limited to 'xorg-data')
| -rwxr-xr-x | xorg-data/xkeyboard-config/CONFLICTS | 2 | ||||
| -rw-r--r-- | xorg-data/xkeyboard-config/HISTORY | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/xorg-data/xkeyboard-config/CONFLICTS b/xorg-data/xkeyboard-config/CONFLICTS index 362a2e9b6b..bafbc0b7d6 100755 --- a/xorg-data/xkeyboard-config/CONFLICTS +++ b/xorg-data/xkeyboard-config/CONFLICTS @@ -4,4 +4,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/xkeyboard-config/HISTORY b/xorg-data/xkeyboard-config/HISTORY index c5fa1cb0c7..8796110ec2 100644 --- a/xorg-data/xkeyboard-config/HISTORY +++ b/xorg-data/xkeyboard-config/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 |