aboutsummaryrefslogtreecommitdiffstats
path: root/src/ChangeLog
diff options
context:
space:
mode:
authorAlan Mackenzie2011-10-28 15:18:00 +0000
committerAlan Mackenzie2011-10-28 15:18:00 +0000
commite376ea4f737a9230a9767a12bdcc530da4b4da87 (patch)
treee74b45fc923a012322eb229ca403fcd07ec1f696 /src/ChangeLog
parent1aecd7ec0e23ab0fb04c4f3f4cbb7c038a85e4ab (diff)
parentd3d0842fe219892079cac179ab0843792f29cf1a (diff)
downloademacs-e376ea4f737a9230a9767a12bdcc530da4b4da87.tar.gz
emacs-e376ea4f737a9230a9767a12bdcc530da4b4da87.zip
Merge.
Diffstat (limited to 'src/ChangeLog')
-rw-r--r--src/ChangeLog4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 21ec98fa217..da0ba4b11f2 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12011-10-28 Chong Yidong <cyd@gnu.org>
2
3 * xdisp.c (note_mouse_highlight): Fix use of uninitialized var.
4
12011-10-28 Dan Nicolaescu <dann@ics.uci.edu> 52011-10-28 Dan Nicolaescu <dann@ics.uci.edu>
2 6
3 * window.c (make_window): Initialize phys_cursor_on_p. 7 * window.c (make_window): Initialize phys_cursor_on_p.