Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 11 Jul 2011 06:05:57 +0000 (23:05 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 11 Jul 2011 06:05:57 +0000 (23:05 -0700)
commitda85a02af7585384008d3ebec836a7b8571f175d
treee6d4f34119ea1c45985eaed207ef6b47f650ea93
parent7f5515125fbc9b46454e1f84b7e3052a0a5326f0
parent4d45a8b7a237e1d33d0ae71d95a0ed7165ea6cda
Merge from trunk.
15 files changed:
ChangeLog
lib-src/ChangeLog
lib-src/update-game-score.c
src/ChangeLog
src/alloc.c
src/buffer.c
src/data.c
src/dispnew.c
src/emacs.c
src/floatfns.c
src/image.c
src/lread.c
src/regex.c
src/sysdep.c
src/xdisp.c