]> git.eshelyaron.com Git - emacs.git/commit
Merge remote-tracking branch 'origin/trunk' into xwidget
authorJoakim Verona <joakim@verona.se>
Mon, 27 May 2013 21:14:19 +0000 (23:14 +0200)
committerJoakim Verona <joakim@verona.se>
Mon, 27 May 2013 21:14:19 +0000 (23:14 +0200)
commit5cf62a1639c5993c1fd6b532f92325b28a13ee79
treed67d1c7c583947f164ee7494601d5c9decbd6b0f
parent3b2a9bcfc08c74d95f46d634fadc758decb1c2b0
parent6ef3db10430c653e302ca5983ade6f8eaa186f85
Merge remote-tracking branch 'origin/trunk' into xwidget

Conflicts:
ChangeLog
lisp/ChangeLog
lisp/progmodes/octave.el
src/Makefile.in
configure.ac
lisp/net/browse-url.el
lisp/progmodes/cc-mode.el
make-dist
src/Makefile.in
src/dispextern.h
src/keyboard.c
src/lisp.h
src/xdisp.c
src/xterm.c