| commit | 201ec4d22b6aaf3c7ab43054a1bbea853be91c87 | |
| author | Carsten Dominik <carsten.dominik@gmail.com> | |
| Fri, 9 May 2008 11:39:07 +0000 (9 13:39 +0200) | ||
| committer | Carsten Dominik <carsten.dominik@gmail.com> | |
| Fri, 9 May 2008 11:39:07 +0000 (9 13:39 +0200) | ||
| tree | 13298586a8aef0ab21a4f5d4e869a6e935f82adc | treesnapshot (tar.gz zip) |
| parent | de39ac51ee5fa32da6fbc95c6a7f7d12938ec632 | commitdiff |
| parent | f91d59c1ade83d3082413dfdf06f161e88b8ff9d | commitdiff |
Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode
Conflicts:
lisp/ChangeLog
Conflicts:
lisp/ChangeLog
| lisp/ChangeLog | diff1 | diff2 | blobhistory |
| lisp/org.el | diff1 | diff2 | blobhistory |