]> git.eshelyaron.com Git - emacs.git/commitdiff
merge from trunk
authorJoakim Verona <joakim@verona.se>
Wed, 14 Aug 2013 04:21:25 +0000 (06:21 +0200)
committerJoakim Verona <joakim@verona.se>
Wed, 14 Aug 2013 04:21:25 +0000 (06:21 +0200)
1  2 
src/window.c

diff --cc src/window.c
Simple merge