aboutsummaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authorJoakim Verona2011-06-30 01:23:11 +0200
committerJoakim Verona2011-06-30 01:23:11 +0200
commit0349bc31b8abcd5c1a49c3f800e052b8581ef1d0 (patch)
tree517e5037e0dbfa5c82dd1dd4189498759f72afa9 /ChangeLog
parent9333b6a4d92243ebeee9c5fc3ae3f1ec1a47abc3 (diff)
parentada35ec18a3429c0389fe1b77d7ae82b8a5715d6 (diff)
downloademacs-0349bc31b8abcd5c1a49c3f800e052b8581ef1d0.tar.gz
emacs-0349bc31b8abcd5c1a49c3f800e052b8581ef1d0.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.