]> code.delx.au - gnu-emacs/commitdiff
delx.au / code / gnu-emacs / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 41c0d73 5ec0337)
merge from trunk
authorJoakim Verona <joakim@verona.se>
Wed, 11 Sep 2013 17:42:49 +0000 (19:42 +0200)
committerJoakim Verona <joakim@verona.se>
Wed, 11 Sep 2013 17:42:49 +0000 (19:42 +0200)
1  2 
src/emacs.c patch | diff1 | diff2 | blob | history

diff --cc src/emacs.c
Simple merge