summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp/timer.el
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2016-06-19 00:54:28 +0200
committerPaul Eggert <eggert@cs.ucla.edu>2016-06-19 00:54:28 +0200
commitf01684313faa9803ddc69e71b66d9a469f955348 (patch)
treee9c09623885e31c90756c0c74373b2e7886674e7 /lisp/emacs-lisp/timer.el
parentd9088290efb49a352c3c23da25a734ed3e269923 (diff)
parentd765175ef1179f834c25fd856ace63c3dc37162c (diff)
downloademacs-f01684313faa9803ddc69e71b66d9a469f955348.tar.gz
emacs-f01684313faa9803ddc69e71b66d9a469f955348.tar.bz2
emacs-f01684313faa9803ddc69e71b66d9a469f955348.zip
; Merge from origin/emacs-25
The following commit was skipped: d765175 Fix ifdef-vs-if typo with RANDR13_LIBRARY
Diffstat (limited to 'lisp/emacs-lisp/timer.el')
0 files changed, 0 insertions, 0 deletions