diff options
| author | Robert Figura | 2010-06-02 23:03:34 +0200 |
|---|---|---|
| committer | Robert Figura | 2010-06-02 23:03:34 +0200 |
| commit | 96e57923ac6db0dc07253af154932075bd6bcf09 (patch) | |
| tree | b5ab06ae85259f2fec5429abcfcb95aa6a9afdb4 | |
| parent | 0c6cceee0bfb141f9440087ce0b7ce2990610a2e (diff) | |
krb5: CONFLICTS: netkit-telnet, telnet-bsd
| -rwxr-xr-x | crypto/krb5-appl/CONFLICTS | 1 | ||||
| -rw-r--r-- | crypto/krb5-appl/HISTORY | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/crypto/krb5-appl/CONFLICTS b/crypto/krb5-appl/CONFLICTS index 39404be987..074b91b94f 100755 --- a/crypto/krb5-appl/CONFLICTS +++ b/crypto/krb5-appl/CONFLICTS @@ -1,2 +1,3 @@ conflicts netkit-telnet +conflicts telnet-bsd conflicts netkit-ftp diff --git a/crypto/krb5-appl/HISTORY b/crypto/krb5-appl/HISTORY index 00189fee5b..c090ff9fc5 100644 --- a/crypto/krb5-appl/HISTORY +++ b/crypto/krb5-appl/HISTORY @@ -1,3 +1,6 @@ +2010-06-02 Robert Figura <template@sourcemage.org> + * CONFLICTS: netkit-telnet, telnet-bsd + 2010-04-04 Ladislav Hagara <hgr@vabo.cz> * DETAILS, DEPENDS, PRE_BUILD, BUILD, CONFLICTS, PROVIDES, system-et.patch.bz2, desktop/telnet.desktop, pam.d/{rexec,rlogin,rsh}, |