projects / org-mode.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8ea5c99 f3a2515)
Merge branch 'maint'
authorNicolas Goaziou <n.goaziou@gmail.com>
Wed, 28 Nov 2012 15:52:27 +0000 (16:52 +0100)
committerNicolas Goaziou <n.goaziou@gmail.com>
Wed, 28 Nov 2012 15:52:27 +0000 (16:52 +0100)
1  2 
testing/lisp/test-org.el patch | diff1 | diff2 | blob | history

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