diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2016-09-26 13:35:56 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2016-09-26 13:35:56 -0700 |
| commit | fffa49b136b02052073fa584cf7b9fe99b1bf951 (patch) | |
| tree | 6065ab2578cfdd73012045e8911a065ab9e0fe0c /lisp/emacs-lisp/ring.el | |
| parent | 2914d52129032c471a6754f4a3961a9dffdc7b18 (diff) | |
| parent | cf9e174ae1d3b1428982204b0786a7db13d94ab7 (diff) | |
| download | emacs-fffa49b136b02052073fa584cf7b9fe99b1bf951.tar.gz emacs-fffa49b136b02052073fa584cf7b9fe99b1bf951.tar.bz2 emacs-fffa49b136b02052073fa584cf7b9fe99b1bf951.zip | |
Merge from origin/emacs-25
cf9e174 Document the optional zlib library in MS-Windows builds
84eb144 ; * admin/notes/unicode: Mention BidiCharacterTest.txt.
73c67dd Fix tagging of DEFUN by etags
ea1960b Avoid resetting track-mouse by mouse clicks
505fef3 Improve nt/README.W32 instructions
1229cc4 Document that desktop file overrides frame parameters
f0eb70d ; Update ChangeLog.2 and ldef-boot.el for Emacs 25.1 release
# Conflicts:
# ChangeLog.2
# admin/notes/unicode
# lisp/ldefs-boot.el
Diffstat (limited to 'lisp/emacs-lisp/ring.el')
0 files changed, 0 insertions, 0 deletions