HCoop Git - bpt/emacs.git/commit

HCoop / bpt / emacs.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: ba93a18 dd41169)

author	Chong Yidong <cyd@gnu.org>
	Thu, 31 May 2012 06:08:06 +0000 (14:08 +0800)
committer	Chong Yidong <cyd@gnu.org>
	Thu, 31 May 2012 06:08:06 +0000 (14:08 +0800)
commit	efc00ab16e2890b75d7224434ac43fe944ade4dd
tree	28c1078ca32b96402cd1a5f618a17b3526143f27	tree \| snapshot (tar.gz zip)
parent	ba93a18774352c97d6dd73c73141cbff6305581b	commit \| diff
parent	dd41169b6cb0105b0766f3d368c657ebafc19cba	commit \| diff

Merge from emacs-24; up to 2012-04-24T21:47:24Z!michael.albinus@gmx.de

14 files changed:

lib-src/ChangeLog	diff1 \|	diff2 \|	blob \| history
lib-src/makefile.w32-in	diff1 \|	diff2 \|	blob \| history
lisp/ChangeLog	diff1 \|	diff2 \|	blob \| history
lisp/desktop.el	diff1 \|	diff2 \|	blob \| history
lisp/emacs-lisp/bytecomp.el	diff1 \|	diff2 \|	blob \| history
nt/ChangeLog	diff1 \|	diff2 \|	blob \| history
nt/configure.bat	diff1 \|	diff2 \|	blob \| history
src/ChangeLog	diff1 \|	diff2 \|	blob \| history
src/charset.c	diff1 \|	diff2 \|	blob \| history
src/doc.c	diff1 \|	diff2 \|	blob \| history
src/keymap.c	diff1 \|	diff2 \|	blob \| history
src/ralloc.c	diff1 \|	diff2 \|	blob \| history
src/search.c	diff1 \|	diff2 \|	blob \| history
src/xdisp.c	diff1 \|	diff2 \|	blob \| history

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