projects / org-mode.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1896fc3 c20730b)
Merge branch 'maint'
authorNicolas Goaziou <n.goaziou@gmail.com>
Mon, 5 Nov 2012 16:40:48 +0000 (17:40 +0100)
committerNicolas Goaziou <n.goaziou@gmail.com>
Mon, 5 Nov 2012 16:40:48 +0000 (17:40 +0100)
1  2 
lisp/org.el patch | diff1 | diff2 | blob | history

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