summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Figura2010-06-02 23:04:09 +0200
committerRobert Figura2010-06-02 23:04:09 +0200
commit118cbd7e6cc6ba8b39b89be159552a038729fc75 (patch)
treeef3cb419d26451024f7e0964df30b06db11a2780
parent96e57923ac6db0dc07253af154932075bd6bcf09 (diff)
netkit-telnet: krb5-appl, telnet-bsd
-rwxr-xr-xnet/netkit-telnet/CONFLICTS3
-rw-r--r--net/netkit-telnet/HISTORY3
2 files changed, 5 insertions, 1 deletions
diff --git a/net/netkit-telnet/CONFLICTS b/net/netkit-telnet/CONFLICTS
index 2dafa658ec..c2142f07da 100755
--- a/net/netkit-telnet/CONFLICTS
+++ b/net/netkit-telnet/CONFLICTS
@@ -1 +1,2 @@
-conflicts krb5
+conflicts telnet-bsd
+conflicts krb5-appl
diff --git a/net/netkit-telnet/HISTORY b/net/netkit-telnet/HISTORY
index b357b41f11..d2d4fd2b22 100644
--- a/net/netkit-telnet/HISTORY
+++ b/net/netkit-telnet/HISTORY
@@ -1,3 +1,6 @@
+2010-06-02 Robert Figura <template@sourcemage.org>
+ * CONFLICTS: krb5-appl, telnet-bsd
+
2006-09-21 Juuso Alasuutari <iuso@sourcemage.org>
* DETAILS: [automated] Removed BUILD_API=2.