]> git.eshelyaron.com Git - emacs.git/commitdiff
projects / emacs.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 46ee4cb 3d78299)
Merger from mainline.
authorEli Zaretskii <eliz@gnu.org>
Sat, 23 Jan 2010 08:49:15 +0000 (03:49 -0500)
committerEli Zaretskii <eliz@gnu.org>
Sat, 23 Jan 2010 08:49:15 +0000 (03:49 -0500)
1  2 
src/xdisp.c patch | diff1 | diff2 | blob | history

diff --cc src/xdisp.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.