]> code.delx.au - gnu-emacs/commitdiff
delx.au / code / gnu-emacs / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2ba8afb d983a10)
auto upstream
authorJoakim Verona <joakim@verona.se>
Sat, 8 Dec 2012 02:36:33 +0000 (03:36 +0100)
committerJoakim Verona <joakim@verona.se>
Sat, 8 Dec 2012 02:36:33 +0000 (03:36 +0100)
1  2 
configure.ac patch | diff1 | diff2 | blob | history
src/keyboard.c patch | diff1 | diff2 | blob | history

diff --cc configure.ac
Simple merge
diff --cc src/keyboard.c
Simple merge