]> git.eshelyaron.com Git - emacs.git/commitdiff
projects / emacs.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6d2a4fc 526e523)
merge from trunk
authorJoakim Verona <joakim@verona.se>
Fri, 16 Aug 2013 05:26:31 +0000 (07:26 +0200)
committerJoakim Verona <joakim@verona.se>
Fri, 16 Aug 2013 05:26:31 +0000 (07:26 +0200)
1  2 
lisp/desktop.el patch | diff1 | diff2 | blob | history

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