diff options
| author | Eric Sandall | 2020-01-07 20:12:54 +0000 |
|---|---|---|
| committer | Eric Sandall | 2020-01-07 20:12:54 +0000 |
| commit | 3ee0a2363c091edcc148d24d04e493f816511b12 (patch) | |
| tree | bf240cf87a7c2fd826914f4fddbbde48bb999eb6 /xorg | |
| parent | e8b0fb155a0594a6090376bfaf60ea892c5c331f (diff) | |
xserver: Auto-conflicts (e.g. spell deprecations) default to 'y'
Diffstat (limited to 'xorg')
| -rwxr-xr-x | xorg/xserver/CONFLICTS | 2 | ||||
| -rw-r--r-- | xorg/xserver/HISTORY | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/xorg/xserver/CONFLICTS b/xorg/xserver/CONFLICTS index 39994f510a..9f7a173914 100755 --- a/xorg/xserver/CONFLICTS +++ b/xorg/xserver/CONFLICTS @@ -1,3 +1,3 @@ conflicts glamor y && conflicts xf86-video-modesetting y && -conflicts xorg-server n +conflicts xorg-server y diff --git a/xorg/xserver/HISTORY b/xorg/xserver/HISTORY index 1d17d076c0..648b0f3f1e 100644 --- a/xorg/xserver/HISTORY +++ b/xorg/xserver/HISTORY @@ -1,3 +1,6 @@ +2020-01-07 Eric Sandall <sandalle@sourcemage.org> + * CONFLICTS: Auto-conflicts (e.g. spell deprecations) default to 'y' + 2019-11-23 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 1.20.6 |