aboutsummaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authorChong Yidong2011-06-28 16:57:57 -0400
committerChong Yidong2011-06-28 16:57:57 -0400
commitada35ec18a3429c0389fe1b77d7ae82b8a5715d6 (patch)
tree4405c0735657c3adbd2296fd53a3d1aaafda16dd /ChangeLog
parentb380a76ffbf54594dfd6fc3d932983ac0439d07f (diff)
parent1176868d0a466ae5374d1c47de70f1fc22ef7cd6 (diff)
downloademacs-ada35ec18a3429c0389fe1b77d7ae82b8a5715d6.tar.gz
emacs-ada35ec18a3429c0389fe1b77d7ae82b8a5715d6.zip
merge from upstream
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog4
1 files changed, 4 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 4bf89e35776..3fb10e14974 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
12011-06-27 Bill Wohler <wohler@newt.com>
2
3 * .bzrignore: Add lisp/mh-e/mh-autoloads.el and lisp/mh-e/mh-cus-load.el.
4
12011-06-25 Paul Eggert <eggert@cs.ucla.edu> 52011-06-25 Paul Eggert <eggert@cs.ucla.edu>
2 6
3 Use gnulib's dup2 module instead of rolling our own. 7 Use gnulib's dup2 module instead of rolling our own.