projects / org-mode.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7cdfa64 f48a8b7)
Merge branch 'maint'
authorNicolas Goaziou <n.goaziou@gmail.com>
Sun, 4 Nov 2012 23:58:34 +0000 (00:58 +0100)
committerNicolas Goaziou <n.goaziou@gmail.com>
Sun, 4 Nov 2012 23:58:34 +0000 (00:58 +0100)
1  2 
lisp/org.el patch | diff1 | diff2 | blob | history
testing/lisp/test-org.el patch | diff1 | diff2 | blob | history

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