]> git.eshelyaron.com Git - emacs.git/commit
merge from trunk
authorroot <root@exodia.verona.se>
Mon, 12 Aug 2013 10:27:22 +0000 (12:27 +0200)
committerroot <root@exodia.verona.se>
Mon, 12 Aug 2013 10:27:22 +0000 (12:27 +0200)
commitc39e73975f7371a6458cd63967d39ba77a1e871a
tree145fb3d8489ecd65ac6b1887e17a204bff751286
parent2427b15992fe47646a2bf2b55891f1e482dedaa0
parent6edea0a595d292c4d3f1a7e862195be07c874e40
merge from trunk

Conflicts:
src/Makefile.in
16 files changed:
configure.ac
lisp/desktop.el
lisp/net/browse-url.el
lisp/vc/vc-dir.el
make-dist
src/Makefile.in
src/buffer.c
src/dispextern.h
src/dispnew.c
src/emacs.c
src/emacsgtkfixed.c
src/keyboard.c
src/lisp.h
src/window.c
src/xdisp.c
src/xterm.c