diff options
| author | Jan Djärv | 2010-04-02 11:45:27 +0200 |
|---|---|---|
| committer | Jan Djärv | 2010-04-02 11:45:27 +0200 |
| commit | 7a5a264fc27bde6870f08ecc5d85eddc36fa0336 (patch) | |
| tree | 54106d60bd5f2273821bb5e3fb73bebf31a5599e /admin/ChangeLog | |
| parent | d0b228766f1471ed104d2e038f63cd4627d79b57 (diff) | |
| parent | 9cb52861f287cbad4608a5fceddae5bac1a90ba6 (diff) | |
| download | emacs-7a5a264fc27bde6870f08ecc5d85eddc36fa0336.tar.gz emacs-7a5a264fc27bde6870f08ecc5d85eddc36fa0336.zip | |
Merge from trunk
Diffstat (limited to 'admin/ChangeLog')
| -rw-r--r-- | admin/ChangeLog | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/admin/ChangeLog b/admin/ChangeLog index 90ba61f7850..cf96d99d3b1 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2010-04-01 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * CPP-DEFINES (__DJGPP__, __GO32__): Remove, no longer used. | ||
| 4 | |||
| 1 | 2010-03-10 Chong Yidong <cyd@stupidchicken.com> | 5 | 2010-03-10 Chong Yidong <cyd@stupidchicken.com> |
| 2 | 6 | ||
| 3 | * Branch for 23.2. | 7 | * Branch for 23.2. |