diff options
author | Treeve Jelbert | 2018-03-08 11:51:56 +0100 |
---|---|---|
committer | Treeve Jelbert | 2018-03-08 11:51:56 +0100 |
commit | 6d655bb8090dbc07a4c1ee5aaf5fafa42d64f399 (patch) | |
tree | ad8da3c23f118c00e5990ddf0a37edf21e3e8029 /xorg/xorgproto | |
parent | 2173c26c85ee02c250ffbd6d44f2ca92f174fd44 (diff) |
xorgproto - use our name for xproxymanagementprotocol
Diffstat (limited to 'xorg/xorgproto')
-rwxr-xr-x | xorg/xorgproto/CONFLICTS | 2 | ||||
-rw-r--r-- | xorg/xorgproto/HISTORY | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/xorg/xorgproto/CONFLICTS b/xorg/xorgproto/CONFLICTS index 3de44741df..3ccbb9415f 100755 --- a/xorg/xorgproto/CONFLICTS +++ b/xorg/xorgproto/CONFLICTS @@ -34,4 +34,4 @@ conflicts xf86rushproto y conflicts xf86vidmodeproto y conflicts xineramaproto y conflicts xproto y -conflicts xproxymngproto y +conflicts xproxymanagementprotocol y diff --git a/xorg/xorgproto/HISTORY b/xorg/xorgproto/HISTORY index b24a28c734..ffa05cc429 100644 --- a/xorg/xorgproto/HISTORY +++ b/xorg/xorgproto/HISTORY @@ -1,3 +1,6 @@ +2018-03-08 Treeve Jelbert <treeve@sourcemage.org> + * CONFLICTS: xproxymngproto => xproxymanagementprotocol + 2018-02-28 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 2018.4 |