diff options
| author | Paul Eggert | 2016-02-09 14:23:10 -0800 |
|---|---|---|
| committer | Paul Eggert | 2016-02-09 14:23:10 -0800 |
| commit | f55fc92f6804b821b7df374e973b859c6364996a (patch) | |
| tree | 8292e5215739249aecc08578c38241abb9d2bb4d /src/alloc.c | |
| parent | 44f853c4acda0634a3541116834c3e768bef650d (diff) | |
| parent | 1eaf68f3689c49ee1d191ad3154563a365f7cf05 (diff) | |
| download | emacs-f55fc92f6804b821b7df374e973b859c6364996a.tar.gz emacs-f55fc92f6804b821b7df374e973b859c6364996a.zip | |
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
Diffstat (limited to 'src/alloc.c')
0 files changed, 0 insertions, 0 deletions