projects / org-mode.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 47486f4 93b0934)
Merge branch 'maint'
authorBastien Guerry <bzg@altern.org>
Tue, 23 Oct 2012 16:41:45 +0000 (18:41 +0200)
committerBastien Guerry <bzg@altern.org>
Tue, 23 Oct 2012 16:41:45 +0000 (18:41 +0200)
1  2 
lisp/org-agenda.el patch | diff1 | diff2 | blob | history

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