summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Figura2010-06-02 23:04:29 +0200
committerRobert Figura2010-06-02 23:04:29 +0200
commit90d7e686fd1ef0da181ae9a28bd8e4b22d7cae55 (patch)
treea58429effcd7846a7aad9dde08e4c514da4ee8ee
parent118cbd7e6cc6ba8b39b89be159552a038729fc75 (diff)
telnet-bsd: CONFLICTS: krb5-appl, netkit-telnet
-rwxr-xr-xnet/telnet-bsd/CONFLICTS1
-rw-r--r--net/telnet-bsd/HISTORY3
2 files changed, 4 insertions, 0 deletions
diff --git a/net/telnet-bsd/CONFLICTS b/net/telnet-bsd/CONFLICTS
index 5c752b1b34..f8b61434a8 100755
--- a/net/telnet-bsd/CONFLICTS
+++ b/net/telnet-bsd/CONFLICTS
@@ -1 +1,2 @@
conflicts netkit-telnet
+conflicts krb5-appl
diff --git a/net/telnet-bsd/HISTORY b/net/telnet-bsd/HISTORY
index 40e034ae60..58e13fd1d0 100644
--- a/net/telnet-bsd/HISTORY
+++ b/net/telnet-bsd/HISTORY
@@ -1,3 +1,6 @@
+2010-06-02 Robert Figura <template@sourcemage.org>
+ * CONFLICTS: krb5-appl, netkit-telnet
+
2009-07-25 Arjan Bouter <abouter@sourcemage.org>
* CONFIGURE, BUILD, INSTALL: telnetd should die ;)