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: e54c5e4 b99e8f8)

author	Glenn Morris <rgm@gnu.org>
	Sat, 1 Nov 2014 18:05:30 +0000 (11:05 -0700)
committer	Glenn Morris <rgm@gnu.org>
	Sat, 1 Nov 2014 18:05:30 +0000 (11:05 -0700)
commit	d5d8ca30e5f481a32414c42bcc3b5a042061ff07
tree	febc223f19801e8e01b9498c5ba9d6c7bfcfa091	tree \| snapshot
parent	e54c5e4e25098be9df9d9c46d32165887b0ff9d3	commit \| diff
parent	b99e8f833671a2b52be654eb477830294c624a97	commit \| diff

Merge from emacs-24; up to 117656

15 files changed:

admin/ChangeLog	diff1 \|	diff2 \|	blob \| history
admin/notes/repo	diff1 \|	diff2 \|	blob \| history
lisp/ChangeLog	diff1 \|	diff2 \|	blob \| history
lisp/Makefile.in	diff1 \|	diff2 \|	blob \| history
lisp/emulation/cua-base.el	diff1 \|	diff2 \|	blob \| history
lisp/progmodes/compile.el	diff1 \|	diff2 \|	blob \| history
lisp/progmodes/vhdl-mode.el	diff1 \|	diff2 \|	blob \| history
lisp/simple.el	diff1 \|	diff2 \|	blob \| history
src/ChangeLog	diff1 \|	diff2 \|	blob \| history
src/emacs.c	diff1 \|	diff2 \|	blob \| history
src/macfont.m	diff1 \|	diff2 \|	blob \| history
src/nsfns.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

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