diff lib-src/ChangeLog @ 109208:0d144b53fe59

Merge from mainline.
author Katsumi Yamaoka <katsumi@flagship2>
date Sun, 30 May 2010 00:32:06 +0000
parents 87dad1e1c860
children d86e65007470
line wrap: on
line diff
--- a/lib-src/ChangeLog	Sat May 29 09:39:12 2010 +0000
+++ b/lib-src/ChangeLog	Sun May 30 00:32:06 2010 +0000
@@ -1,3 +1,9 @@
+2010-05-29  Chong Yidong  <cyd@stupidchicken.com>
+
+	* emacsclient.c (longopts, decode_options, print_help_and_exit):
+	New arg `-parent-id'.
+	(main): Send parent-id to Emacs.
+
 2010-05-27  Glenn Morris  <rgm@gnu.org>
 
 	* Makefile.in (distclean): No more Makefile.c.