git.eshelyaron.com Git - emacs.git/commit

]> git.eshelyaron.com Git - emacs.git/commit

projects / emacs.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 7f55151 4d45a8b)

author	Paul Eggert <eggert@cs.ucla.edu>
	Mon, 11 Jul 2011 06:05:57 +0000 (23:05 -0700)
committer	Paul Eggert <eggert@cs.ucla.edu>
	Mon, 11 Jul 2011 06:05:57 +0000 (23:05 -0700)
commit	da85a02af7585384008d3ebec836a7b8571f175d
tree	e6d4f34119ea1c45985eaed207ef6b47f650ea93	tree \| snapshot
parent	7f5515125fbc9b46454e1f84b7e3052a0a5326f0	commit \| diff
parent	4d45a8b7a237e1d33d0ae71d95a0ed7165ea6cda	commit \| diff

Merge from trunk.

15 files changed:

ChangeLog	diff1 \|	diff2 \|	blob \| history
lib-src/ChangeLog	diff1 \|	diff2 \|	blob \| history
lib-src/update-game-score.c	diff1 \|	diff2 \|	blob \| history
src/ChangeLog	diff1 \|	diff2 \|	blob \| history
src/alloc.c	diff1 \|	diff2 \|	blob \| history
src/buffer.c	diff1 \|	diff2 \|	blob \| history
src/data.c	diff1 \|	diff2 \|	blob \| history
src/dispnew.c	diff1 \|	diff2 \|	blob \| history
src/emacs.c	diff1 \|	diff2 \|	blob \| history
src/floatfns.c	diff1 \|	diff2 \|	blob \| history
src/image.c	diff1 \|	diff2 \|	blob \| history
src/lread.c	diff1 \|	diff2 \|	blob \| history
src/regex.c	diff1 \|	diff2 \|	blob \| history
src/sysdep.c	diff1 \|	diff2 \|	blob \| history
src/xdisp.c	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.