diff options
| author | Joakim Verona | 2011-07-20 19:17:35 +0200 |
|---|---|---|
| committer | Joakim Verona | 2011-07-20 19:17:35 +0200 |
| commit | c196618976ca42baca2e2de2167a8c5b9c28d75f (patch) | |
| tree | ee1b4498df35c584f53804354e8bf067b5219ab0 /lisp/ChangeLog | |
| parent | 9c4f13500786571d004d4530e2ffd84c5457d61c (diff) | |
| parent | bfa4f1909c8d7c22a235d04aa8798f2fb7f9c970 (diff) | |
| download | emacs-c196618976ca42baca2e2de2167a8c5b9c28d75f.tar.gz emacs-c196618976ca42baca2e2de2167a8c5b9c28d75f.zip | |
merge upstream
Diffstat (limited to 'lisp/ChangeLog')
| -rw-r--r-- | lisp/ChangeLog | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index b138d78a070..d96ad569543 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,10 @@ | |||
| 1 | 2011-07-20 Sam Steingold <sds@gnu.org> | ||
| 2 | |||
| 3 | * progmodes/etags.el (etags-file-of-tag, etags-tags-table-files) | ||
| 4 | (etags-tags-included-tables): Call `convert-standard-filename' on | ||
| 5 | the file names contained in TAGS so that windows Emacs can handle | ||
| 6 | TAGS files created by cygwin ctags. | ||
| 7 | |||
| 1 | 2011-07-20 Lars Magne Ingebrigtsen <larsi@gnus.org> | 8 | 2011-07-20 Lars Magne Ingebrigtsen <larsi@gnus.org> |
| 2 | 9 | ||
| 3 | * proced.el (proced-update): Revert yesterday's bug#1779 patch, | 10 | * proced.el (proced-update): Revert yesterday's bug#1779 patch, |