projects / org-mode.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b810431 340f51f)
Merge branch 'maint'
authorBastien Guerry <bzg@altern.org>
Wed, 23 Jan 2013 11:58:15 +0000 (12:58 +0100)
committerBastien Guerry <bzg@altern.org>
Wed, 23 Jan 2013 11:58:15 +0000 (12:58 +0100)
1  2 
lisp/org-element.el patch | diff1 | diff2 | blob | history

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