HCoop Git - bpt/emacs.git/commit

HCoop / bpt / emacs.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 608a450 e3b8388)

author	Daniel Colascione <dancol@dancol.org>
	Mon, 7 Apr 2014 20:54:16 +0000 (13:54 -0700)
committer	Daniel Colascione <dancol@dancol.org>
	Mon, 7 Apr 2014 20:54:16 +0000 (13:54 -0700)
commit	7e31acf6b81fdce7258077645bc239767c484841
tree	1f0d7b063a19b54982550797df063e0a9f87eaed	tree \| snapshot (tar.gz zip)
parent	608a4502b9fa8f5681368657fba5d5fd0fa46817	commit \| diff
parent	e3b838807bf9fbbbec9826de6c1e4efdf72acb78	commit \| diff

Merge from emacs-24; up to 2014-04-01T20:18:12Z!eggert@cs.ucla.edu

16 files changed:

ChangeLog	diff1 \|	diff2 \|	blob \| history
configure.ac	diff1 \|	diff2 \|	blob \| history
doc/emacs/ChangeLog	diff1 \|	diff2 \|	blob \| history
doc/lispref/ChangeLog	diff1 \|	diff2 \|	blob \| history
doc/lispref/os.texi	diff1 \|	diff2 \|	blob \| history
etc/NEWS	diff1 \|	diff2 \|	blob \| history
lisp/ChangeLog	diff1 \|	diff2 \|	blob \| history
lisp/faces.el	diff1 \|	diff2 \|	blob \| history
lisp/files.el	diff1 \|	diff2 \|	blob \| history
lisp/help.el	diff1 \|	diff2 \|	blob \| history
nt/emacs.rc	diff1 \|	diff2 \|	blob \| history
src/ChangeLog	diff1 \|	diff2 \|	blob \| history
src/alloc.c	diff1 \|	diff2 \|	blob \| history
src/keyboard.c	diff1 \|	diff2 \|	blob \| history
src/lisp.h	diff1 \|	diff2 \|	blob \| history
test/ChangeLog	diff1 \|	diff2 \|	blob \| history

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