aboutsummaryrefslogtreecommitdiffstats
path: root/src/ChangeLog
diff options
context:
space:
mode:
authorAlan Mackenzie2011-10-28 14:37:05 +0000
committerAlan Mackenzie2011-10-28 14:37:05 +0000
commit1aecd7ec0e23ab0fb04c4f3f4cbb7c038a85e4ab (patch)
tree9c45fb37a455cf15c2e55cd0738d167f248b3666 /src/ChangeLog
parent93b5b3bdc8b734132c530acd6ffae1196c0865bc (diff)
parent31b39d1389640fa5677c8f86a2944a1197f4ada8 (diff)
downloademacs-1aecd7ec0e23ab0fb04c4f3f4cbb7c038a85e4ab.tar.gz
emacs-1aecd7ec0e23ab0fb04c4f3f4cbb7c038a85e4ab.zip
Boring 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 50fc953024a..21ec98fa217 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12011-10-28 Dan Nicolaescu <dann@ics.uci.edu>
2
3 * window.c (make_window): Initialize phys_cursor_on_p.
4
12011-10-28 Stefan Monnier <monnier@iro.umontreal.ca> 52011-10-28 Stefan Monnier <monnier@iro.umontreal.ca>
2 6
3 * lisp.h (struct Lisp_Symbol): Update comments. 7 * lisp.h (struct Lisp_Symbol): Update comments.