diff options
| author | Michael Albinus | 2014-11-13 16:29:20 +0100 |
|---|---|---|
| committer | Michael Albinus | 2014-11-13 16:29:20 +0100 |
| commit | d856e6b0d87fed67001e83fcfccba9c932af3487 (patch) | |
| tree | a4bf9bbfeedc89d0d7ed5240910cc890445ce4ca /lisp/ChangeLog | |
| parent | a85cf0d9fe03713cfae31415208cbd49d3227ae1 (diff) | |
| parent | 38fa4bcbd238a0628ca51c5cd656211a0ef62eef (diff) | |
| download | emacs-d856e6b0d87fed67001e83fcfccba9c932af3487.tar.gz emacs-d856e6b0d87fed67001e83fcfccba9c932af3487.zip | |
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
Conflicts:
lisp/ChangeLog
Diffstat (limited to 'lisp/ChangeLog')
| -rw-r--r-- | lisp/ChangeLog | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 6db9f206d15..e3baa30ce6a 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -2,6 +2,14 @@ | |||
| 2 | 2 | ||
| 3 | * vc/vc-hg.el (vc-hg-state): Disable pager. (Bug#18940) | 3 | * vc/vc-hg.el (vc-hg-state): Disable pager. (Bug#18940) |
| 4 | 4 | ||
| 5 | 2014-11-13 Lars Magne Ingebrigtsen <larsi@gnus.org> | ||
| 6 | |||
| 7 | * net/eww.el (eww-form-file): Fix version number. | ||
| 8 | |||
| 9 | 2014-11-10 Lars Magne Ingebrigtsen <larsi@gnus.org> | ||
| 10 | |||
| 11 | * net/eww.el (eww-form-file): :type isn't a valid `defface' keyword. | ||
| 12 | |||
| 5 | 2014-11-10 Kenjiro NAKAYAMA <nakayamakenjiro@gmail.com> | 13 | 2014-11-10 Kenjiro NAKAYAMA <nakayamakenjiro@gmail.com> |
| 6 | 14 | ||
| 7 | * net/eww.el(eww-form-file(defface)): New defface of file upload form. | 15 | * net/eww.el(eww-form-file(defface)): New defface of file upload form. |