]> git.eshelyaron.com Git - emacs.git/commitdiff
projects / emacs.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 95a60dc 6c6014d)
merge from trunk
authorJoakim Verona <joakim@verona.se>
Fri, 23 Aug 2013 14:42:37 +0000 (16:42 +0200)
committerJoakim Verona <joakim@verona.se>
Fri, 23 Aug 2013 14:42:37 +0000 (16:42 +0200)
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.