projects / org-mode.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 127bffa 6d7142b)
Merge branch 'maint'
authorBastien Guerry <bzg@altern.org>
Wed, 13 Feb 2013 18:27:01 +0000 (19:27 +0100)
committerBastien Guerry <bzg@altern.org>
Wed, 13 Feb 2013 18:27:01 +0000 (19:27 +0100)
1  2 
lisp/org-mobile.el patch | diff1 | diff2 | blob | history
lisp/org.el patch | diff1 | diff2 | blob | history

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