Improve channel merging and restrict channel age display.

[srvx.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index c016eb1c3a66d65d7e6eebdae92ade89449ad014..92a822f3ce04772e2eb2186f47e503ff2548bf73 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,21 @@
 # arch-tag: automatic-ChangeLog--srvx@srvx.net--2005-srvx/srvx--devo--1.3
 #
 
+2005-08-14 01:34:04 GMT        Michael Poole <mdpoole@troilus.org>     patch-26
+
+    Summary:
+      Improve channel merging and restrict channel age display.
+    Revision:
+      srvx--devo--1.3--patch-26
+
+    src/chanserv.c (merge_data): Merge registered and owner-transfer
+        timestamps, may_opchan flag, and max visitor count.
+      (cmd_info): Only show channel age if the user is privileged.
+
+    modified files:
+     ChangeLog src/chanserv.c
+
+
 2005-07-19 18:31:26 GMT        Michael Poole <mdpoole@troilus.org>     patch-25
 
     Summary: