HCoop / bpt / emacs.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f14e303 4b00d3b)
Merge from mainline.
authorEli Zaretskii <eliz@gnu.org>
Sat, 9 Jan 2010 11:00:21 +0000 (06:00 -0500)
committerEli Zaretskii <eliz@gnu.org>
Sat, 9 Jan 2010 11:00:21 +0000 (06:00 -0500)
1  2 
src/window.h patch | diff1 | diff2 | blob | history
src/xdisp.c patch | diff1 | diff2 | blob | history

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