]> git.eshelyaron.com Git - emacs.git/commitdiff
merge master
authorjave <joakim@verona.se>
Sun, 4 Jan 2015 08:09:36 +0000 (09:09 +0100)
committerjave <joakim@verona.se>
Sun, 4 Jan 2015 08:09:36 +0000 (09:09 +0100)
1  2 
src/Makefile.in
src/xterm.c

diff --cc src/Makefile.in
Simple merge
diff --cc src/xterm.c
Simple merge