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
..
2016-02-09 20:04:34 +01:00
2015-11-18 08:42:02 +08:00
2016-01-01 01:34:24 -08:00
2015-09-11 11:05:12 -07:00
2016-01-01 01:34:24 -08:00
2016-02-14 19:25:32 -08:00
2016-01-01 01:34:24 -08:00
2016-01-01 01:34:24 -08:00
2015-09-11 11:05:12 -07:00
2015-11-06 14:08:12 +01:00
2014-11-11 13:28:05 -05:00
2016-09-26 13:35:56 -07:00
2015-11-18 08:42:02 +08:00
2016-01-01 01:34:24 -08:00
2014-10-31 11:03:23 +02:00