]> code.delx.au - gnu-emacs/commitdiff
manual upstream merge
authorJoakim Verona <joakim@verona.se>
Fri, 27 Jun 2014 10:10:03 +0000 (12:10 +0200)
committerJoakim Verona <joakim@verona.se>
Fri, 27 Jun 2014 10:10:03 +0000 (12:10 +0200)
1  2 
lisp/desktop.el
make-dist
src/Makefile.in
src/lisp.h

diff --cc lisp/desktop.el
Simple merge
diff --cc make-dist
Simple merge
diff --cc src/Makefile.in
Simple merge
diff --cc src/lisp.h
Simple merge