]> git.eshelyaron.com Git - emacs.git/commitdiff
projects / emacs.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: dddd533 a37eba8)
Merge remote-tracking branch 'origin/master' into concurrency-libtask
authorPhilipp Stephani <phst@google.com>
Sun, 30 Oct 2016 17:29:45 +0000 (18:29 +0100)
committerPhilipp Stephani <phst@google.com>
Sun, 30 Oct 2016 17:29:45 +0000 (18:29 +0100)
1  2 
src/Makefile.in patch | diff1 | diff2 | blob | history
src/xterm.c patch | diff1 | diff2 | blob | history

diff --cc src/Makefile.in
Simple merge
diff --cc src/xterm.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.