]> git.eshelyaron.com Git - emacs.git/commit
Merge branch 'concurrency'
authorEli Zaretskii <eliz@gnu.org>
Sun, 4 Dec 2016 17:59:17 +0000 (19:59 +0200)
committerEli Zaretskii <eliz@gnu.org>
Sun, 4 Dec 2016 17:59:17 +0000 (19:59 +0200)
commitde4624c99ea5bbe38ad5aff7b6461cc5c740d0be
tree1b57de9e769cdb695cb2cecf157b50f7dea9cfe5
parenta486fabb41cdbaa5813c2687fd4008945297d71d
parente7bde34e939451d87fb42a36195086bdbe48b5e1
Merge branch 'concurrency'

Conflicts (resolved):
configure.ac
src/Makefile.in
src/alloc.c
src/bytecode.c
src/emacs.c
src/eval.c
src/lisp.h
src/process.c
src/regex.c
src/regex.h
32 files changed:
configure.ac
doc/lispref/Makefile.in
doc/lispref/elisp.texi
doc/lispref/objects.texi
doc/lispref/processes.texi
etc/DEBUG
lisp/subr.el
nt/inc/sys/socket.h
src/.gdbinit
src/Makefile.in
src/alloc.c
src/buffer.c
src/buffer.h
src/bytecode.c
src/data.c
src/emacs.c
src/eval.c
src/lisp.h
src/print.c
src/process.c
src/process.h
src/regex.c
src/regex.h
src/search.c
src/sysdep.c
src/thread.c
src/thread.h
src/w32.c
src/w32.h
src/w32proc.c
src/window.c
src/xgselect.c