Merge branch 'master' into cairo
commit6aaa489dc112f51f6045f79b37cb78dd513e398f
authorJan D <jan.h.d@swipnet.se>
Sat, 23 May 2015 10:28:54 +0000 (23 12:28 +0200)
committerJan D <jan.h.d@swipnet.se>
Sat, 23 May 2015 10:28:54 +0000 (23 12:28 +0200)
treea34eb6ad435ab877848f7464374570549ca55ec5
parentee14727ce033bae3bc11af35e7843604e5a5e635
parent7ac84a2570e1268cc040fcd529508307b2b22c01
Merge branch 'master' into cairo
configure.ac
src/font.c
src/xfns.c
src/xterm.c