projects / org-mode.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 56b47cd fd0380b)
Merge branch 'maint'
authorBastien Guerry <bzg@altern.org>
Wed, 2 Jan 2013 22:54:12 +0000 (23:54 +0100)
committerBastien Guerry <bzg@altern.org>
Wed, 2 Jan 2013 22:54:12 +0000 (23:54 +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.