diff options
| author | Glenn Morris <rgm@gnu.org> | 2021-08-06 08:49:32 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2021-08-06 08:49:32 -0700 |
| commit | 0b049fe71d73f6885a3c81ea31829e3befc18933 (patch) | |
| tree | 77fc29c174e71bfe1943d78fde317f4da6928fd4 /test/lisp/emacs-lisp/timer-tests.el | |
| parent | c18bfbe6e452bfbef276fc8325bdbfc6c7e0d61b (diff) | |
| parent | b77f6af24e9193a4f70622cda6d641c58e885c22 (diff) | |
| download | emacs-0b049fe71d73f6885a3c81ea31829e3befc18933.tar.gz emacs-0b049fe71d73f6885a3c81ea31829e3befc18933.tar.bz2 emacs-0b049fe71d73f6885a3c81ea31829e3befc18933.zip | |
Merge from origin/emacs-27
b77f6af24e (origin/emacs-27) ERC right stamps: also use latest buffer...
# Conflicts:
# lisp/erc/erc-stamp.el
Diffstat (limited to 'test/lisp/emacs-lisp/timer-tests.el')
0 files changed, 0 insertions, 0 deletions