]> git.eshelyaron.com Git - emacs.git/commitdiff
projects / emacs.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9681f30 c477f20)
Merge branch 'master' into xwidget
authorjave <joakim@verona.se>
Mon, 5 Jan 2015 13:12:26 +0000 (14:12 +0100)
committerjave <joakim@verona.se>
Mon, 5 Jan 2015 13:12:26 +0000 (14:12 +0100)
1  2 
src/window.c patch | diff1 | diff2 | blob | history

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