diff options
| author | Jaka Kranjc | 2008-08-30 13:41:50 +0200 |
|---|---|---|
| committer | Jaka Kranjc | 2008-08-30 13:41:50 +0200 |
| commit | 3d4263206d153f05ed72f3b1ad1e6ae0266a437a (patch) | |
| tree | 4de243a2a27767441bf695b4c7f7f21d69977407 /xorg-data | |
| parent | 6f2e99b6bd1a9cdefb3d5167d082c20d9d78859f (diff) | |
xkbdata: fixed conflict
Diffstat (limited to 'xorg-data')
| -rwxr-xr-x | xorg-data/xkbdata/CONFLICTS | 1 | ||||
| -rw-r--r-- | xorg-data/xkbdata/HISTORY | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/xorg-data/xkbdata/CONFLICTS b/xorg-data/xkbdata/CONFLICTS index 6adc7aeba1..8007c92eb4 100755 --- a/xorg-data/xkbdata/CONFLICTS +++ b/xorg-data/xkbdata/CONFLICTS @@ -1,4 +1,3 @@ -conflicts xkeyboard-config conflicts xdirectfb y conflicts xfree86-devel y conflicts xfree86-libs y diff --git a/xorg-data/xkbdata/HISTORY b/xorg-data/xkbdata/HISTORY index 14ed0377cc..aacc82207f 100644 --- a/xorg-data/xkbdata/HISTORY +++ b/xorg-data/xkbdata/HISTORY @@ -1,3 +1,6 @@ +2008-08-30 Jaka Kranjc <lynxlynxlynx@sourcemage.org> + * CONFLICTS: don't conflict with xkeyboard-config, you depend on it + 2008-03-17 Eric Sandall <sandalle@sourcemage.org> * CONFLICTS: Auto-conflicts with xorg as well |