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: c089503 d0ca114)

author	jave <joakim@verona.se>
	Fri, 2 Jan 2015 15:30:55 +0000 (16:30 +0100)
committer	jave <joakim@verona.se>
	Fri, 2 Jan 2015 15:30:55 +0000 (16:30 +0100)
commit	db4613576d3115aa320f0293d081ce98baa06acd
tree	829968643b451bd3f64c791e4d3a6c928010e14c	tree \| snapshot
parent	c089503bac34376e75ae6f1d2c289fc8c9f42b8f	commit \| diff
parent	d0ca1148fe2d1e72e86f0197731071f139c143e3	commit \| diff

merge master

16 files changed:

configure.ac	diff1 \|	diff2 \|	blob \| history
lisp/net/browse-url.el	diff1 \|	diff2 \|	blob \| history
src/Makefile.in	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/emacsgtkfixed.c	diff1 \|	diff2 \|	blob \| history
src/emacsgtkfixed.h	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/termhooks.h	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

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