]> git.eshelyaron.com Git - emacs.git/commit
manual upstream merge
authorJoakim Verona <joakim@verona.se>
Mon, 23 Jun 2014 07:41:17 +0000 (09:41 +0200)
committerJoakim Verona <joakim@verona.se>
Mon, 23 Jun 2014 07:41:17 +0000 (09:41 +0200)
commitc4916d541b6f91e80283b473c5191651c719228a
treeb8f4b0850983aaefc598a5db3f51e9fff9e457af
parentce8171797dafbde765170b79e5f154afc4872e86
parent814200c2675928b79ee0e023c0fc939ef0da8317
manual upstream merge
15 files changed:
configure.ac
lisp/desktop.el
src/Makefile.in
src/buffer.c
src/dispextern.h
src/dispnew.c
src/emacs.c
src/keyboard.c
src/lisp.h
src/macuvs.h.moved
src/print.c
src/termhooks.h
src/window.c
src/xdisp.c
src/xterm.c