projects / org-mode.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d8ad57d 68acb95)
Merge branch 'maint'
authorBastien Guerry <bzg@altern.org>
Wed, 2 Jan 2013 09:48:06 +0000 (10:48 +0100)
committerBastien Guerry <bzg@altern.org>
Wed, 2 Jan 2013 09:48:06 +0000 (10:48 +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.