• Paul Eggert's avatar
    Merge from origin/emacs-25 · c325e199
    Paul Eggert authored
    927afa1e ; Update ChangeLog.2 and ldef-boot.el for Emacs 25.1 RC2
    6bf83b5e * etc/AUTHORS: Update the AUTHORS file
    73cbb813 ; ChangeLog spelling fixes
    9b99772c Some assorted documentation clarifications
    37d4723f Improve commentary in src/character.h
    5ccd5933 ; Fix typo in /etc/NEWS
    96e3d163 * etc/NEWS: Mention the change in json-encode-string.
    2e524034 ; * etc/NEWS: Mention incompatible change in url-http-create...
    2e4e74ea Merge branch 'emacs-25' of git.savannah.gnu.org:/srv/git/emac...
    66dea652 ; * doc/lispref/windows.texi (Window Parameters): Grammar twe...
    
    # Conflicts:
    #	ChangeLog.2
    #	lisp/ldefs-boot.el
    c325e199
ChangeLog.1 1.1 MB
The source could not be displayed because it is larger than 1 MB. You can load it anyway or download it instead.