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 /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 'ChangeLog')
| -rw-r--r-- | ChangeLog | 18 |
1 files changed, 18 insertions, 0 deletions
| @@ -1,3 +1,21 @@ | |||
| 1 | 2014-11-17 Paul Eggert <eggert@cs.ucla.edu> | ||
| 2 | |||
| 3 | Restore 'Bug#' -> 'debbugs:' rewrite in log-edit-mode. | ||
| 4 | * .dir-locals.el (log-edit-mode): Restore the (log-edit-rewrite-fixes | ||
| 5 | "[ \n](bug#\\([0-9]+\\))" . "debbugs:\\1"). See Glenn Morris in: | ||
| 6 | http://lists.gnu.org/archive/html/emacs-devel/2014-11/msg01187.html | ||
| 7 | |||
| 8 | Simplify and fix doc-related .gitignore files. | ||
| 9 | This fixes some unwanted 'git status' output after 'make docs'. | ||
| 10 | * .gitignore: Add **/Makefile, **/makefile. | ||
| 11 | Remove Makefile, makefile. | ||
| 12 | Add doc/*/*.xxx rules for the usual kinds of documentation outputs | ||
| 13 | and temporaries. Add doc/misc/cc-mode.ss. | ||
| 14 | * doc/emacs/.gitignore, doc/lispintro/.gitignore, doc/misc/.gitignore: | ||
| 15 | * lwlib/.gitignore, oldXMenu/.gitignore: | ||
| 16 | Remove, as these .gitignore files are no longer needed. | ||
| 17 | * doc/lispintro/.gitignore: Replace with list of exceptional PDF files. | ||
| 18 | |||
| 1 | 2014-11-26 Dani Moncayo <dmoncayo@gmail.com> | 19 | 2014-11-26 Dani Moncayo <dmoncayo@gmail.com> |
| 2 | 20 | ||
| 3 | * configure.ac [MINGW]: Fix the way of getting the right host | 21 | * configure.ac [MINGW]: Fix the way of getting the right host |