Paul Eggert fffa49b136 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		2016-09-26 13:35:56 -07:00
..
emacs	Merge from origin/emacs-25	2016-09-26 13:35:56 -07:00
lispintro	Fix comment in files-in-below-directory	2016-07-28 19:53:58 -04:00
lispref	Merge from origin/emacs-25	2016-09-26 13:32:28 -07:00
man	* doc/man/emacsclient.1: Document +line:column option.	2016-03-29 14:20:12 -07:00
misc	Fix 'dired-mark-extension' with prefix argument	2016-09-24 18:10:42 +03:00