aboutsummaryrefslogtreecommitdiffstats
path: root/src/ChangeLog
diff options
context:
space:
mode:
authorBill Wohler2012-11-25 10:33:16 -0800
committerBill Wohler2012-11-25 10:33:16 -0800
commita09777fb290dfd273a66a845e75b208f23262f06 (patch)
treeff5bdf05f86b1e451673f7e7db65a1304419335e /src/ChangeLog
parent77f9b93eb2ff2e2d62cdb6bde2f9476b2420bf24 (diff)
parentd0457b578da02c7873b15ef4bfaf5607f5db7c5c (diff)
downloademacs-a09777fb290dfd273a66a845e75b208f23262f06.tar.gz
emacs-a09777fb290dfd273a66a845e75b208f23262f06.zip
Merge from trunk.
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 859b3a7d254..c612c4dd365 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12012-11-25 Paul Eggert <eggert@cs.ucla.edu>
2
3 * sysdep.c (sys_subshell): Don't assume pid_t fits in int.
4
12012-11-24 Ken Brown <kbrown@cornell.edu> 52012-11-24 Ken Brown <kbrown@cornell.edu>
2 6
3 * keyboard.c (HAVE_MOUSE): 7 * keyboard.c (HAVE_MOUSE):