diff src/ChangeLog @ 106803:4abcc08ffba2

Merge from trunk
author Jan D. <jan.h.d@swipnet.se>
date Tue, 12 Jan 2010 08:54:18 +0100
parents b92c3979701c
children 65abe959e89a
line wrap: on
line diff
--- a/src/ChangeLog	Mon Jan 11 08:37:07 2010 +0100
+++ b/src/ChangeLog	Tue Jan 12 08:54:18 2010 +0100
@@ -1,3 +1,13 @@
+2010-01-12  Glenn Morris  <rgm@gnu.org>
+
+	* emacs.c (REPORT_EMACS_BUG_PRETEST_ADDRESS): Set it to
+	bug-gnu-emacs rather than emacs-pretest-bug.
+
+2010-01-11  Chong Yidong  <cyd@stupidchicken.com>
+
+	* nsterm.m (syms_of_nsterm): Initialize Qcontrol etc. before
+	initializing the Lisp variables that depend on them.
+
 2010-01-11  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
 	* xfns.c (x_set_menu_bar_lines) [!USE_X_TOOLKIT && !USE_GTK]: