| commit | d1f1c586d5324eb17c97db87598eb6cd3842ebe8 | |
| author | Bastien Guerry <bzg@altern.org> | |
| Fri, 20 Apr 2012 09:43:27 +0000 (20 11:43 +0200) | ||
| committer | Bastien Guerry <bzg@altern.org> | |
| Fri, 20 Apr 2012 09:43:27 +0000 (20 11:43 +0200) | ||
| tree | ea3ee39470966f9cc052ee7c60086e4e38817d31 | treesnapshot (tar.gz zip) |
| parent | d17761a05a514037751cae34ef8bedd204b19db9 | commitdiff |
| parent | 7d7144819fffbf752f7e1ca10e9e30a241764859 | commitdiff |
Fix merge conflict.
| doc/org.texi | diff1 | diff2 | blobhistory |
| lisp/org-agenda.el | diff1 | diff2 | blobhistory |
| lisp/org.el | diff1 | diff2 | blobhistory |