diff options
| author | Treeve Jelbert | 2018-06-01 11:09:28 +0200 |
|---|---|---|
| committer | Treeve Jelbert | 2018-07-12 11:29:45 +0200 |
| commit | ee1f8a26af5e2999c452539c71d8550a1b69d300 (patch) | |
| tree | 308b116d0d7c3f87d21968032f23b6741d20929c /xorg-xserver | |
| parent | 65e1a75b89417e27817932d743804a564bc48a91 (diff) | |
xorg-server - now conflicts xserver
Diffstat (limited to 'xorg-xserver')
| -rwxr-xr-x | xorg-xserver/xorg-server/CONFLICTS | 1 | ||||
| -rw-r--r-- | xorg-xserver/xorg-server/HISTORY | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/xorg-xserver/xorg-server/CONFLICTS b/xorg-xserver/xorg-server/CONFLICTS index 886f6ec8db..445448a836 100755 --- a/xorg-xserver/xorg-server/CONFLICTS +++ b/xorg-xserver/xorg-server/CONFLICTS @@ -1,2 +1,3 @@ conflicts glamor conflicts xf86-video-modesetting +conflicts xserver n diff --git a/xorg-xserver/xorg-server/HISTORY b/xorg-xserver/xorg-server/HISTORY index 42f28abc60..55ea5031ef 100644 --- a/xorg-xserver/xorg-server/HISTORY +++ b/xorg-xserver/xorg-server/HISTORY @@ -1,3 +1,6 @@ +2018-06-01 Treeve Jelbert <treeve@sourcemage.org> + * CONFLICTS: add xserver + 2018-05-10 Pavel Vinogradov <public@sourcemage.org> * DETAILS: version 1.20.0, redundancy-- |