diff options
| author | Kenichi Handa | 2010-08-29 14:22:52 +0900 |
|---|---|---|
| committer | Kenichi Handa | 2010-08-29 14:22:52 +0900 |
| commit | b295da470123c7beea983f9b500db5286fd12996 (patch) | |
| tree | d5e22dcd1b8963977f4dc757da1bcaa97115a606 | |
| parent | 769ae9e16f2d6eea60ca2ca6340f8e11fa49eafd (diff) | |
| parent | 8818c329b249e923b290fdc7864565ceb0ec9028 (diff) | |
| download | emacs-b295da470123c7beea983f9b500db5286fd12996.tar.gz emacs-b295da470123c7beea983f9b500db5286fd12996.zip | |
merge emacs-23
| -rw-r--r-- | etc/ChangeLog | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/etc/ChangeLog b/etc/ChangeLog index f6166ef8a5f..d2145fb811b 100644 --- a/etc/ChangeLog +++ b/etc/ChangeLog | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | 2010-08-22 Alex Harsanyi <harsanyi@mac.com> | 1 | 2010-08-22 Alex Harsanyi <harsanyi@mac.com> (tiny change) |
| 2 | 2 | ||
| 3 | * emacs3.py: Import imp module and use it (Bug#5756). | 3 | * emacs3.py: Import imp module and use it (Bug#5756). |
| 4 | 4 | ||