]> code.delx.au - gnu-emacs/commitdiff
Merge branch 'master' into cairo
authorJan D <jan.h.d@swipnet.se>
Sat, 23 May 2015 10:28:54 +0000 (12:28 +0200)
committerJan D <jan.h.d@swipnet.se>
Sat, 23 May 2015 10:28:54 +0000 (12:28 +0200)
1  2 
configure.ac
src/font.c
src/xfns.c
src/xterm.c

diff --cc configure.ac
Simple merge
diff --cc src/font.c
Simple merge
diff --cc src/xfns.c
Simple merge
diff --cc src/xterm.c
Simple merge