projects / org-mode.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fb8ba17 6272ff2)
Merge branch 'maint'
authorBastien Guerry <bzg@altern.org>
Tue, 1 Jan 2013 23:32:44 +0000 (00:32 +0100)
committerBastien Guerry <bzg@altern.org>
Tue, 1 Jan 2013 23:32:44 +0000 (00:32 +0100)
1  2 
lisp/org-exp.el patch | diff1 | diff2 | blob | history

diff --cc lisp/org-exp.el
Simple merge
Org-mode, an Emacs mode for organizing your life.