[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] [emacs] 02/02: Merge branch 'master' of git.sv.gnu.org:/sr
|
From: |
Katsumi Yamaoka |
|
Subject: |
[Emacs-diffs] [emacs] 02/02: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs |
|
Date: |
Thu, 13 Nov 2014 22:12:49 +0000 |
yamaoka pushed a commit to branch master
in repository emacs.
commit 0868bad993c725397d2034fdc8ab1c77ad8b03a0
Merge: 4af97e6 14b1c9d
Author: Katsumi Yamaoka <address@hidden>
Date: Thu Nov 13 22:12:32 2014 +0000
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
lisp/ChangeLog | 2 ++
lisp/net/shr.el | 4 +++-
2 files changed, 5 insertions(+), 1 deletions(-)