]> git.eshelyaron.com Git - emacs.git/commit
merge master, fix conflicts
authorJoakim Verona <joakim@verona.se>
Sun, 11 Jan 2015 17:40:21 +0000 (18:40 +0100)
committerJoakim Verona <joakim@verona.se>
Sun, 11 Jan 2015 17:40:21 +0000 (18:40 +0100)
commitcc7cb20d6abc0f862e5513b24831bba0eaecaa5f
treeafc2fc05401504aa0c28699dc3bc155c5b0d7f58
parentd972b504f30ff4300ba368940751e8736dddf0b4
parent9a57bda31569294ecaf8138a06e5edda9c0d87e3
merge master, fix conflicts
configure.ac
src/buffer.c
src/dispextern.h
src/dispnew.c
src/emacs.c
src/keyboard.c
src/lisp.h
src/print.c
src/window.c
src/xdisp.c
src/xterm.c