]> code.delx.au - gnu-emacs/commit
delx.au / code / gnu-emacs / commit
summary | shortlog | log | commit | commitdiff | tree
(merge: 97d4492 4d2e7e1)
Merge from origin/emacs-24
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 29 Mar 2015 21:24:19 +0000 (14:24 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 29 Mar 2015 21:24:19 +0000 (14:24 -0700)
commitd16fb740912bf4874e7087f6f419427516047977
tree0704317ab37ce7a842d0cfe3b739d89e98d8b630tree
parent97d44922da3c22b3973f95892bfa2ee4afc0ceaccommit | diff
parent4d2e7e17547edda414129aeee910cd0334b4e85ecommit | diff
Merge from origin/emacs-24

4d2e7e1 Fixes: debbugs:19175
2e0cfcc Fix the preamble text of the DIR file we install  (Bug#20213)
22ece83 src/w32proc.c: Describe in a comment w32 subprocess implementation.

Conflicts:
ChangeLog
src/ChangeLog
src/xterm.c
ChangeLog diff1 | diff2 | blob | history
src/ChangeLog diff1 | diff2 | blob | history
src/gtkutil.c diff1 | diff2 | blob | history
src/w32proc.c diff1 | diff2 | blob | history
src/xterm.c diff1 | diff2 | blob | history