]> git.eshelyaron.com Git - emacs.git/commitdiff
upstream merge
authorJoakim Verona <joakim@verona.se>
Wed, 30 Sep 2015 10:54:26 +0000 (12:54 +0200)
committerJoakim Verona <joakim@verona.se>
Wed, 30 Sep 2015 10:54:26 +0000 (12:54 +0200)
1  2 
src/window.c

diff --cc src/window.c
Simple merge