]> code.delx.au - gnu-emacs/commit
delx.au / code / gnu-emacs / commit
summary | shortlog | log | commit | commitdiff | tree
(merge: 44f853c 1eaf68f)
Merge from origin/emacs-25
authorPaul Eggert <eggert@cs.ucla.edu>
Tue, 9 Feb 2016 22:23:10 +0000 (14:23 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Tue, 9 Feb 2016 22:23:10 +0000 (14:23 -0800)
commitf55fc92f6804b821b7df374e973b859c6364996a
tree8292e5215739249aecc08578c38241abb9d2bb4dtree
parent44f853c4acda0634a3541116834c3e768bef650dcommit | diff
parent1eaf68f3689c49ee1d191ad3154563a365f7cf05commit | diff
Merge from origin/emacs-25

1eaf68f * test/automated/file-notify-tests.el (file-notify-test06-many-events):
d333716 ; * etc/NEWS: Expand news entry for scss-mode
c32c16f ; Better document changes in ls-lisp default behavior
dc6eed2 Fix doc string of tls-program
etc/NEWS diff1 | diff2 | blob | history
test/lisp/filenotify-tests.el diff1 | diff2 | blob | history