HCoop Git - bpt/emacs.git/commit

HCoop / bpt / emacs.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 8f50130 898169a)

author	Paul Eggert <eggert@cs.ucla.edu>
	Wed, 14 Dec 2011 10:51:30 +0000 (02:51 -0800)
committer	Paul Eggert <eggert@cs.ucla.edu>
	Wed, 14 Dec 2011 10:51:30 +0000 (02:51 -0800)
commit	59815c02506eb39b61e672528ed03885749ba529
tree	08770ed78fae3dc1a0996250d61e127ebfd135fd	tree \| snapshot (tar.gz zip)
parent	8f50130c565eaf0ad7c49e4ad044c3291ecdfa71	commit \| diff
parent	898169a2d88c3538cdfd41feb0b16267165065bd	commit \| diff

Merge from trunk.

12 files changed:

src/ChangeLog	diff1 \|	diff2 \|	blob \| history
src/alloc.c	diff1 \|	diff2 \|	blob \| history
src/coding.c	diff1 \|	diff2 \|	blob \| history
src/editfns.c	diff1 \|	diff2 \|	blob \| history
src/emacs.c	diff1 \|	diff2 \|	blob \| history
src/fontset.c	diff1 \|	diff2 \|	blob \| history
src/ftfont.c	diff1 \|	diff2 \|	blob \| history
src/lread.c	diff1 \|	diff2 \|	blob \| history
src/nsfont.m	diff1 \|	diff2 \|	blob \| history
src/termhooks.h	diff1 \|	diff2 \|	blob \| history
src/window.c	diff1 \|	diff2 \|	blob \| history
src/xfns.c	diff1 \|	diff2 \|	blob \| history

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