diff mac/ChangeLog @ 90667:dbe3f29e61d6

Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 505-522) - Update from CVS - Merge from gnus--rel--5.10 - Update from CVS: etc/TUTORIAL.cn: Updated. - Merge from erc--emacs--22 * gnus--rel--5.10 (patch 164-167) - Update from CVS Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-137
author Miles Bader <miles@gnu.org>
date Tue, 21 Nov 2006 08:56:38 +0000
parents b5c13d1564a9 45adfdc231c2
children f1d13e615070
line wrap: on
line diff
--- a/mac/ChangeLog	Tue Nov 21 01:10:47 2006 +0000
+++ b/mac/ChangeLog	Tue Nov 21 08:56:38 2006 +0000
@@ -1,3 +1,12 @@
+2006-11-14  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+	* inc/config.h: Sync with src/config.in.
+
+2006-11-08  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+	* INSTALL: Remove descriptions about --without-x.  Remove
+	--without-carbon from configure options for X11 build.
+
 2006-09-19  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
 	* INSTALL: Remove descriptions about experimental flags.
@@ -438,7 +447,7 @@
 	GetScrapFlavorFlags.
 
 	* src/macfns.c: Synchronize with changes in w32fns.c.
- 	[MAC_OSX]: Include Carbon headers.
+	[MAC_OSX]: Include Carbon headers.
 	(x_real_positions): Use Carbon routine GetWindowPortBounds.
 	(x_set_scroll_bar_width): Set width of scroll bar to 16.
 	(x_make_gc): Remove static qualifier.
@@ -846,6 +855,7 @@
 
 ;; Local Variables:
 ;; coding: iso-2022-7bit-unix
+;; add-log-time-zone-rule: t
 ;; End:
 
     Copyright (C) 2001, 2002, 2003, 2004, 2005,