master updated (5bdf413b19 -> 96212e1a27)

[Po Lu]

oldosfan pushed a change to branch master.

      from  5bdf413b19 Fix mouse face problems when moving between two frames 
on Haiku
       new  a6952f78f3 Stop sending touch-end events if coalescing scroll events
       new  96212e1a27 Fix XRegisterIMInstantiateCallback function argument 
configure test


Summary of changes:
 configure.ac | 2 +-
 src/xterm.c  | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)