aboutsummaryrefslogtreecommitdiffstats
path: root/src/ChangeLog
diff options
context:
space:
mode:
authorGlenn Morris2012-12-22 11:09:52 -0800
committerGlenn Morris2012-12-22 11:09:52 -0800
commit00afe3a454119390e78eaaa319a7d05e5e7723ae (patch)
tree26e0f292873faadeb48d6ef73710f0e5a1b308ef /src/ChangeLog
parent04d9b71ab79f7773d9dba27ae2388a9e9ca563d4 (diff)
parentddc412646dbcc51032cf438064d5eb4c8dded906 (diff)
downloademacs-00afe3a454119390e78eaaa319a7d05e5e7723ae.tar.gz
emacs-00afe3a454119390e78eaaa319a7d05e5e7723ae.zip
Merge from emacs-24; up to 2012-12-02T06:22:32Z!cyd@gnu.org
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 19cb4935c7b..f8f0b82d3da 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12012-12-22 Martin Rudalics <rudalics@gmx.at>
2
3 * window.c (Fselect_window): Reword doc-string (Bug#13248).
4
12012-12-22 Eli Zaretskii <eliz@gnu.org> 52012-12-22 Eli Zaretskii <eliz@gnu.org>
2 6
3 * w32term.c (w32fullscreen_hook): New function. 7 * w32term.c (w32fullscreen_hook): New function.