code.delx.au - gnu-emacs/commit

]> code.delx.au - gnu-emacs/commit

delx.au / code / gnu-emacs / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 298dfce fc5ebc3)

author	Stefan Monnier <monnier@iro.umontreal.ca>
	Mon, 22 Sep 2014 19:20:45 +0000 (15:20 -0400)
committer	Stefan Monnier <monnier@iro.umontreal.ca>
	Mon, 22 Sep 2014 19:20:45 +0000 (15:20 -0400)
commit	9949231fb06aa4a2dfa536e9d5125a81424db3a7
tree	a2259e8489127b8685097a20a3fd3d7be222d9fe	tree
parent	298dfce8ac018aca6f8f1a38d7199cc28bfaf7fd	commit \| diff
parent	fc5ebc3f497a152132407d57a14cce147d59d29c	commit \| diff

Merge from emacs-24

19 files changed:

ChangeLog	diff1 \|	diff2 \|	blob \| history
configure.ac	diff1 \|	diff2 \|	blob \| history
lisp/ChangeLog	diff1 \|	diff2 \|	blob \| history
lisp/cedet/ChangeLog	diff1 \|	diff2 \|	blob \| history
lisp/url/ChangeLog	diff1 \|	diff2 \|	blob \| history
lisp/url/url-http.el	diff1 \|	diff2 \|	blob \| history
lisp/url/url.el	diff1 \|	diff2 \|	blob \| history
lisp/window.el	diff1 \|	diff2 \|	blob \| history
src/ChangeLog	diff1 \|	diff2 \|	blob \| history
src/dispextern.h	diff1 \|	diff2 \|	blob \| history
src/eval.c	diff1 \|	diff2 \|	blob \| history
src/frame.c	diff1 \|	diff2 \|	blob \| history
src/image.c	diff1 \|	diff2 \|	blob \| history
src/lisp.h	diff1 \|	diff2 \|	blob \| history
src/macfont.m	diff1 \|	diff2 \|	blob \| history
src/unexmacosx.c	diff1 \|	diff2 \|	blob \| history
src/w32term.c	diff1 \|	diff2 \|	blob \| history
src/xdisp.c	diff1 \|	diff2 \|	blob \| history
src/xterm.c	diff1 \|	diff2 \|	blob \| history