]> code.delx.au - gnu-emacs/commitdiff
delx.au / code / gnu-emacs / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ae97848 0f00e94)
Merge from mainline.
authorEli Zaretskii <eliz@gnu.org>
Sat, 20 Feb 2010 10:25:57 +0000 (05:25 -0500)
committerEli Zaretskii <eliz@gnu.org>
Sat, 20 Feb 2010 10:25:57 +0000 (05:25 -0500)
1  2 
src/dispextern.h patch | diff1 | diff2 | blob | history
src/term.c patch | diff1 | diff2 | blob | history

diff --cc src/dispextern.h
Simple merge
diff --cc src/term.c
Simple merge