HCoop Git - bpt/emacs.git/commit

HCoop / bpt / emacs.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 9180598 234148b)

author	Stefan Monnier <monnier@iro.umontreal.ca>
	Wed, 26 Sep 2012 15:19:10 +0000 (11:19 -0400)
committer	Stefan Monnier <monnier@iro.umontreal.ca>
	Wed, 26 Sep 2012 15:19:10 +0000 (11:19 -0400)
commit	3a880af4a79688e90da45311a8d85bae2d59a811
tree	178e2f4ac5889ad1de54fc02c967f7acb377ce64	tree \| snapshot (tar.gz zip)
parent	9180598cb164cf32daf0e1761a8143e720460987	commit \| diff
parent	234148bf943ffce55121aefc8694889eb08b0daa	commit \| diff

Merge profiler branch

12 files changed:

etc/NEWS	diff1 \|	diff2 \|	blob \| history
lisp/ChangeLog	diff1 \|	diff2 \|	blob \| history
lisp/profiler.el	\|	diff2 \|	blob \| history
src/ChangeLog	diff1 \|	diff2 \|	blob \| history
src/Makefile.in	diff1 \|	diff2 \|	blob \| history
src/alloc.c	diff1 \|	diff2 \|	blob \| history
src/emacs.c	diff1 \|	diff2 \|	blob \| history
src/eval.c	diff1 \|	diff2 \|	blob \| history
src/lisp.h	diff1 \|	diff2 \|	blob \| history
src/makefile.w32-in	diff1 \|	diff2 \|	blob \| history
src/profiler.c	\|	diff2 \|	blob \| history
src/xdisp.c	diff1 \|	diff2 \|	blob \| history

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