Mercurial > emacs

diff lib-src/ChangeLog @ 109793:b60dcdd855f0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from mainline.
author Katsumi Yamaoka <yamaoka@jpl.org>
date Sun, 08 Aug 2010 22:52:25 +0000
parents 0781924c2a38
children fdbd24f8d999
line wrap: on
line diff
--- a/lib-src/ChangeLog	Fri Aug 06 03:43:29 2010 +0000
+++ b/lib-src/ChangeLog	Sun Aug 08 22:52:25 2010 +0000
@@ -1,3 +1,16 @@
+2010-08-07  Juanma Barranquero  <lekktu@gmail.com>
+
+	* ebrowse.c (usage, version, mark_virtual):
+	Remove duplicate declarations.
+
+2010-08-06  Dan Nicolaescu  <dann@ics.uci.edu>
+
+	* emacsclient.c: Move socket related #includes together with the
+	rest of the #includes.  Move a WINDOWSNT includes closer together.
+	(HAVE_CONFIG_H): Remove.
+	(NO_RETURN): Remove, defined in config.h.
+	(main): Convert definition to standard C.
+
 2010-07-29  Juanma Barranquero  <lekktu@gmail.com>
 
 	* make-docfile.c (write_c_args): Warn for old-style empty arglist ().