]> git.eshelyaron.com Git - emacs.git/commitdiff
projects / emacs.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 144b437 d5a1acf)
merge from trunk
authorJoakim Verona <joakim@verona.se>
Thu, 15 Aug 2013 15:06:31 +0000 (17:06 +0200)
committerJoakim Verona <joakim@verona.se>
Thu, 15 Aug 2013 15:06:31 +0000 (17:06 +0200)
1  2 
src/lisp.h patch | diff1 | diff2 | blob | history

diff --cc src/lisp.h
Simple merge
Unnamed repository; edit this file 'description' to name the repository.