*** empty log message ***

diff --git a/lib-src/ChangeLog.multi-tty b/lib-src/ChangeLog.multi-tty
index f8eedb5d756eba8ae40c43c89e8cc79b9051fdd4..6812eeef847e0beaa5c52c27595324a9b48e2ee0 100644 (file)
--- a/lib-src/ChangeLog.multi-tty
+++ b/lib-src/ChangeLog.multi-tty
@@ -1,3 +1,8 @@
+2007-05-21  Juanma Barranquero  <lekktu@gmail.com>
+
+       * emacsclient.c (print_help_and_exit): Restore and adapt trunk
+       change from 2006-11-23 which was lost in the merge.
+
 2007-05-19  Dan Nicolaescu  <dann@ics.uci.edu>
 
        * emacsclient.c (decode_options): Don't use a tty on mac carbon.
@@ -14,7 +19,7 @@
 
 2007-05-16  Jason Rumney  <jasonr@gnu.org>
 
-       * emacsclient.c: (emacs_socket): Rename from s.
+       * emacsclient.c (emacs_socket): Rename from s.
        Move definition below includes it depends on.
        (SEND_STRING, SEND_QUOTED): Remove obfuscation macros.
        (quote_argument, set_tcp_socket, handle_sigcont, handle_sigtstp):