diff options
| author | Ted Zlatanov | 2014-11-26 21:31:11 -0500 |
|---|---|---|
| committer | Ted Zlatanov | 2014-11-26 21:31:11 -0500 |
| commit | ba4502fe1465f7803beca3ae187e41f0b25bef10 (patch) | |
| tree | de8bdc219eeeba72e1a8b271ac96234c3c5af447 /admin/ChangeLog | |
| parent | b121ef10f500c0377c2ce665e8ccd8b97a6aedfd (diff) | |
| parent | 81e0cca7bbc99dbfda898a8aaab740ae121cf045 (diff) | |
| download | emacs-ba4502fe1465f7803beca3ae187e41f0b25bef10.tar.gz emacs-ba4502fe1465f7803beca3ae187e41f0b25bef10.zip | |
Merge branch 'emacs-24'
Conflicts:
nt/addsection.c
nt/inc/ms-w32.h
src/w32.c
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 cc69367555f..6d134046a38 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2014-11-17 Oscar Fuentes <ofv@wanadoo.es> | ||
| 2 | |||
| 3 | * admin/CPP-DEFINES: Mention MINGW_W64. | ||
| 4 | |||
| 1 | 2014-11-22 Glenn Morris <rgm@gnu.org> | 5 | 2014-11-22 Glenn Morris <rgm@gnu.org> |
| 2 | 6 | ||
| 3 | * admin.el (set-version): No more need to update nt/*.rc. | 7 | * admin.el (set-version): No more need to update nt/*.rc. |