Merge branch 'master' into cairo
commit75c8741afba2321add3ad52c5143b4fdb1d63e18
authorJan D <jan.h.d@swipnet.se>
Fri, 3 Apr 2015 10:32:13 +0000 (3 12:32 +0200)
committerJan D <jan.h.d@swipnet.se>
Fri, 3 Apr 2015 10:32:13 +0000 (3 12:32 +0200)
tree3a125791aba92eb58bee81163a93c3246f275a54
parent734900695acbe17bc7c52c85133918b8949fd2d3
parent0b914bada39e4577cd9e9209a15c44cc1f83294d
Merge branch 'master' into cairo
ChangeLog
configure.ac
lisp/ChangeLog
lwlib/ChangeLog
src/ChangeLog
src/dispextern.h
src/ftfont.c
src/gtkutil.c
src/xfns.c
src/xterm.c
src/xterm.h