]> git.eshelyaron.com Git - emacs.git/commit
Merge remote-tracking branch 'origin/master' into xwidget_mvp
authorJoakim Verona <joakim@verona.se>
Mon, 25 May 2015 15:30:15 +0000 (17:30 +0200)
committerJoakim Verona <joakim@verona.se>
Mon, 25 May 2015 15:30:15 +0000 (17:30 +0200)
commit97cc85a8a64d0fa0122773972330eabd0f638c2a
tree863a9e1de116217280b65b32dd8ac01f42497d8e
parentb4656572a1779c0516e9048f1a88434ce5b72536
parentac59d538982d040c215ef7689f253abbbfe3921a
Merge remote-tracking branch 'origin/master' into xwidget_mvp

Conflicts:
src/Makefile.in
configure.ac
src/Makefile.in
src/dispextern.h
src/xterm.c