]> code.delx.au - gnu-emacs/commitdiff
delx.au / code / gnu-emacs / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a8dd976 31a97ac)
; Merge from origin/emacs-25
authorJohn Wiegley <johnw@newartisans.com>
Tue, 12 Jan 2016 06:48:10 +0000 (22:48 -0800)
committerJohn Wiegley <johnw@newartisans.com>
Tue, 12 Jan 2016 06:48:10 +0000 (22:48 -0800)
The following commits were skipped:

31a97ac Merge branch 'emacs-25' of git.sv.gnu.org:/srv/git/emacs into emacs-25
4e62197 Introduce check-expensive tests.
9fb185a shr-tag-video bug fix


Trivial merge