]> git.eshelyaron.com Git - emacs.git/commitdiff
auto upstream
authorJoakim Verona <joakim@verona.se>
Sat, 27 Apr 2013 06:32:21 +0000 (08:32 +0200)
committerJoakim Verona <joakim@verona.se>
Sat, 27 Apr 2013 06:32:21 +0000 (08:32 +0200)
1  2 
configure.ac
src/lisp.h

diff --cc configure.ac
Simple merge
diff --cc src/lisp.h
Simple merge