aboutsummaryrefslogtreecommitdiffstats
path: root/src/ChangeLog
diff options
context:
space:
mode:
authorGlenn Morris2012-08-28 09:01:59 -0700
committerGlenn Morris2012-08-28 09:01:59 -0700
commiteada086196ccb005ded188ac2e58d41f3682a125 (patch)
treef195bbf91841ea4e85d465307d62c709924892c2 /src/ChangeLog
parent37b9743e79bac608a45fade0744248446aaa0a33 (diff)
parent806f0cc7302bd1dacfad8366f67a97e9bfbc8fc9 (diff)
downloademacs-eada086196ccb005ded188ac2e58d41f3682a125.tar.gz
emacs-eada086196ccb005ded188ac2e58d41f3682a125.zip
Merge from emacs-24; up to 2012-05-04T19:17:01Z!monnier@iro.umontreal.ca
Diffstat (limited to 'src/ChangeLog')
-rw-r--r--src/ChangeLog9
1 files changed, 9 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 2521ddc4144..5bafa1a04f8 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,12 @@
12012-08-28 Eli Zaretskii <eliz@gnu.org>
2
3 * ralloc.c (free_bloc): Don't dereference a 'heap' structure if it
4 is not one of the heaps we manage. (Bug#12242)
5
62012-08-28 Glenn Morris <rgm@gnu.org>
7
8 * eval.c (Fcalled_interactively_p): Doc fix. (Bug#11747)
9
12012-08-28 Martin Rudalics <rudalics@gmx.at> 102012-08-28 Martin Rudalics <rudalics@gmx.at>
2 11
3 * window.c (Fset_window_configuration): Remove handling of 12 * window.c (Fset_window_configuration): Remove handling of