diff options
| author | Robin Cook | 2005-12-24 17:06:18 +0000 |
|---|---|---|
| committer | Robin Cook | 2005-12-24 17:06:18 +0000 |
| commit | f382c3c838eedc73a1aceda422cac6fa96a2463f (patch) | |
| tree | 8f06c087de94e3e20c5341a62ba626c201043014 /xorg-data | |
| parent | a39e9d83f327710dc37128f0ea1eb0bc3839582c (diff) | |
added conflicts between the two
Diffstat (limited to 'xorg-data')
| -rwxr-xr-x | xorg-data/xkbdata/CONFLICTS | 1 | ||||
| -rw-r--r-- | xorg-data/xkbdata/HISTORY | 3 | ||||
| -rwxr-xr-x | xorg-data/xkeyboard-config/CONFLICTS | 1 | ||||
| -rw-r--r-- | xorg-data/xkeyboard-config/HISTORY | 3 |
4 files changed, 8 insertions, 0 deletions
diff --git a/xorg-data/xkbdata/CONFLICTS b/xorg-data/xkbdata/CONFLICTS new file mode 100755 index 0000000000..0de605c979 --- /dev/null +++ b/xorg-data/xkbdata/CONFLICTS @@ -0,0 +1 @@ +conflicts xkeyboard-config diff --git a/xorg-data/xkbdata/HISTORY b/xorg-data/xkbdata/HISTORY index 263c3c7413..f0dd6a73b9 100644 --- a/xorg-data/xkbdata/HISTORY +++ b/xorg-data/xkbdata/HISTORY @@ -1,3 +1,6 @@ +2005-12-24 Robin Cook <rcook@wyrms.net> + * CONFLICTS: added xkeyboard-config + 2005-12-22 Robin Cook <rcook@wyrms.net> * DETAILS: Updated VERSION to 1.0.1 added XORG_VER diff --git a/xorg-data/xkeyboard-config/CONFLICTS b/xorg-data/xkeyboard-config/CONFLICTS new file mode 100755 index 0000000000..d076eadeff --- /dev/null +++ b/xorg-data/xkeyboard-config/CONFLICTS @@ -0,0 +1 @@ +conflicts xkbdata diff --git a/xorg-data/xkeyboard-config/HISTORY b/xorg-data/xkeyboard-config/HISTORY index 71d8c3b655..1c88b95178 100644 --- a/xorg-data/xkeyboard-config/HISTORY +++ b/xorg-data/xkeyboard-config/HISTORY @@ -1,3 +1,6 @@ +2005-12-24 Robin Cook <rcook@wyrms.net> + * CONFLICTS: added xkbdata + 2005-12-23 Robin Cook <rcook@wyrms.net> * DETAILS: updated VERSION to 0.7 |