HCoop Git - bpt/emacs.git/commit

HCoop / bpt / emacs.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 2143fa3 fbf31a9)

author	Stefan Monnier <monnier@iro.umontreal.ca>
	Tue, 17 Jul 2012 11:52:00 +0000 (07:52 -0400)
committer	Stefan Monnier <monnier@iro.umontreal.ca>
	Tue, 17 Jul 2012 11:52:00 +0000 (07:52 -0400)
commit	4dc7c8d5795458e89d19b59f64760e155c2cd70b
tree	2eb1ef73d69102f0ebee4e39056078adcdd49529	tree \| snapshot (tar.gz zip)
parent	2143fa32671374cdef26fdb24355bf690728a344	commit \| diff
parent	fbf31a9c2c08c86a7ab490cb7b920245b829a61d	commit \| diff

Merge from emacs-24

12 files changed:

admin/CPP-DEFINES	diff1 \|	diff2 \|	blob \| history
admin/ChangeLog	diff1 \|	diff2 \|	blob \| history
admin/bzrmerge.el	diff1 \|	diff2 \|	blob \| history
lisp/ChangeLog	diff1 \|	diff2 \|	blob \| history
lisp/gnus/ChangeLog	diff1 \|	diff2 \|	blob \| history
lisp/gnus/shr.el	diff1 \|	diff2 \|	blob \| history
lisp/progmodes/sh-script.el	diff1 \|	diff2 \|	blob \| history
src/ChangeLog	diff1 \|	diff2 \|	blob \| history
src/buffer.c	diff1 \|	diff2 \|	blob \| history
src/dired.c	diff1 \|	diff2 \|	blob \| history
src/fileio.c	diff1 \|	diff2 \|	blob \| history
src/s/msdos.h	diff1 \|	diff2 \|	blob \| history

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