]> git.eshelyaron.com Git - emacs.git/commit
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)
commit47e9d6281c56cbfa26bb88f02782288377e75c3e
treef955efd4ca283039830fb95e3fd6a679d42aecaf
parentdddd5333d1a90c8a1fd3128a41c5f5dcb6b38684
parenta37eba849eddc41375ad73974f6fcb1258aa8eba
Merge remote-tracking branch 'origin/master' into concurrency-libtask
src/Makefile.in
src/xterm.c