]> git.eshelyaron.com Git - emacs.git/commit
projects / emacs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 8dfff87 1a941d6)
Merge from origin/emacs-24
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 18 Mar 2015 18:45:36 +0000 (11:45 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 18 Mar 2015 18:45:36 +0000 (11:45 -0700)
commit81deba3d7a2b187d58fe26bd8b4eafb5687095e1
tree82feff9e8228de216840a6c96ba7c006ce337e24tree | snapshot
parent8dfff871bdf0e420c6f5570e72afc80471d40d51commit | diff
parent1a941d6c9eab9a35682408d6b85a1a98cfb6b01dcommit | diff
Merge from origin/emacs-24

1a941d6 Fix incorrect usage of @key in the User Manual  (Bug#20135)
14c47d3 doc/misc/efaq-w32.texi: Spell-check.
ac85901 doc/misc/efaq-w32.texi: Remove outdated information and update.
c43762d Fix description of fullscreen mode on MS-Windows (Bug#20110).
ea8cab3 doc/lispref/minibuf.texi (Basic Completion): Fix a typo.  (Bug#20108)
2fdec80 Improve indexing in Emacs manual  (Bug#20105)
cc11321 Fix --no-bitmap-icon

Conflicts:
doc/emacs/ChangeLog
doc/lispref/ChangeLog
doc/misc/ChangeLog
src/ChangeLog
13 files changed:
doc/emacs/ChangeLog diff1 | diff2 | blob | history
doc/emacs/display.texi diff1 | diff2 | blob | history
doc/emacs/misc.texi diff1 | diff2 | blob | history
doc/emacs/msdos-xtra.texi diff1 | | blob | history
doc/emacs/msdos.texi diff1 | | blob | history
doc/emacs/programs.texi diff1 | diff2 | blob | history
doc/lispref/ChangeLog diff1 | diff2 | blob | history
doc/lispref/minibuf.texi diff1 | diff2 | blob | history
doc/misc/ChangeLog diff1 | diff2 | blob | history
doc/misc/efaq-w32.texi diff1 | diff2 | blob | history
doc/misc/efaq.texi diff1 | diff2 | blob | history
src/ChangeLog diff1 | diff2 | blob | history
src/frame.h diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.