Public Git Hosting - emacs.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: d972b50 9a57bda)

commit	cc7cb20d6abc0f862e5513b24831bba0eaecaa5f
author	Joakim Verona <joakim@verona.se>
	Sun, 11 Jan 2015 17:40:21 +0000 (11 18:40 +0100)
committer	Joakim Verona <joakim@verona.se>
	Sun, 11 Jan 2015 17:40:21 +0000 (11 18:40 +0100)
tree	afc2fc05401504aa0c28699dc3bc155c5b0d7f58	tree \| snapshot (tar.gz zip)
parent	d972b504f30ff4300ba368940751e8736dddf0b4	commit \| diff
parent	9a57bda31569294ecaf8138a06e5edda9c0d87e3	commit \| diff

merge master, fix conflicts

configure.ac	diff1 \|	diff2 \|	blob \| history
src/buffer.c	diff1 \|	diff2 \|	blob \| history
src/dispextern.h	diff1 \|	diff2 \|	blob \| history
src/dispnew.c	diff1 \|	diff2 \|	blob \| history
src/emacs.c	diff1 \|	diff2 \|	blob \| history
src/keyboard.c	diff1 \|	diff2 \|	blob \| history
src/lisp.h	diff1 \|	diff2 \|	blob \| history
src/print.c	diff1 \|	diff2 \|	blob \| history
src/window.c	diff1 \|	diff2 \|	blob \| history
src/xdisp.c	diff1 \|	diff2 \|	blob \| history
src/xterm.c	diff1 \|	diff2 \|	blob \| history

Emacs repository mirror