]> git.eshelyaron.com Git - emacs.git/commitdiff
projects / emacs.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5693f3d 2f908e0)
Merge branch 'master' into xwidget
authorJoakim Verona <joakim@verona.se>
Thu, 22 Jan 2015 23:13:27 +0000 (00:13 +0100)
committerJoakim Verona <joakim@verona.se>
Thu, 22 Jan 2015 23:13:27 +0000 (00:13 +0100)
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.