diff options
| author | John Wiegley <johnw@newartisans.com> | 2016-03-03 23:53:26 -0800 |
|---|---|---|
| committer | John Wiegley <johnw@newartisans.com> | 2016-03-03 23:53:26 -0800 |
| commit | 5ab243f40e4db91586ff74b01a775a5218a1d5be (patch) | |
| tree | 24cce1dcac68815db7f1da1efd1f957e5356e049 /lisp/emacs-lisp/trace.el | |
| parent | f991a50a90ca5317073f01ccff37ff5048b1881e (diff) | |
| parent | 52f64cc2e74ab83752c8f2d37ef0fc6df5ef8b30 (diff) | |
| download | emacs-5ab243f40e4db91586ff74b01a775a5218a1d5be.tar.gz emacs-5ab243f40e4db91586ff74b01a775a5218a1d5be.tar.bz2 emacs-5ab243f40e4db91586ff74b01a775a5218a1d5be.zip | |
; Merge from origin/emacs-25
The following commit was skipped:
52f64cc Merge branch 'emacs-25' of git.sv.gnu.org:/srv/git/emacs into emacs-25
Diffstat (limited to 'lisp/emacs-lisp/trace.el')
0 files changed, 0 insertions, 0 deletions