Merge from atest branch.
commit1658b4014f884a5bee07acdebc02774780957735
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 27 Mar 2011 08:15:26 +0000 (27 01:15 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 27 Mar 2011 08:15:26 +0000 (27 01:15 -0700)
treed7e01ecbf1633e76d9eedcef8bccf4c2ec694405
parentfe75f92609a806701f8a4d0385f3a053bc00e63d
parent9a2c6e0545bc418137abab8fb675f53c4f461853
Merge from atest branch.
src/ChangeLog
src/image.c
src/keyboard.c
src/term.c
src/xterm.c