]> code.delx.au - gnu-emacs/commitdiff
delx.au / code / gnu-emacs / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 61a7b85 a212a18 4d3762f)
upstream
authorJoakim Verona <joakim@verona.se>
Wed, 22 Feb 2012 09:21:32 +0000 (10:21 +0100)
committerJoakim Verona <joakim@verona.se>
Wed, 22 Feb 2012 09:21:32 +0000 (10:21 +0100)
1  2  3 
src/lisp.h patch | diff1 | diff2 | diff3 | blob | history
src/xterm.c patch | diff1 | diff2 | diff3 | blob | history

diff --cc src/lisp.h
Simple merge
diff --cc src/xterm.c
Simple merge