HCoop Git - bpt/emacs.git/commit

HCoop / bpt / emacs.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 726e0ab 43dc9f5)

author	Paul Eggert <eggert@cs.ucla.edu>
	Fri, 29 Jul 2011 05:31:12 +0000 (22:31 -0700)
committer	Paul Eggert <eggert@cs.ucla.edu>
	Fri, 29 Jul 2011 05:31:12 +0000 (22:31 -0700)
commit	18ab493650d648ab8dca651ea2698861f926e895
tree	b16ca478db1e96af8d0be9a20ff1361bea6d12ee	tree \| snapshot (tar.gz zip)
parent	726e0ab18e84ce0df6b9dc1612bf4d92b9d1e52a	commit \| diff
parent	43dc9f5b0187276c24e1f63f2a23ba4b81c20e07	commit \| diff

Merge from trunk.

13 files changed:

src/ChangeLog	diff1 \|	diff2 \|	blob \| history
src/buffer.c	diff1 \|	diff2 \|	blob \| history
src/callproc.c	diff1 \|	diff2 \|	blob \| history
src/editfns.c	diff1 \|	diff2 \|	blob \| history
src/frame.c	diff1 \|	diff2 \|	blob \| history
src/image.c	diff1 \|	diff2 \|	blob \| history
src/lread.c	diff1 \|	diff2 \|	blob \| history
src/nsmenu.m	diff1 \|	diff2 \|	blob \| history
src/nsterm.h	diff1 \|	diff2 \|	blob \| history
src/nsterm.m	diff1 \|	diff2 \|	blob \| history
src/xdisp.c	diff1 \|	diff2 \|	blob \| history
src/xfaces.c	diff1 \|	diff2 \|	blob \| history
src/xfns.c	diff1 \|	diff2 \|	blob \| history

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