| commit | 21c7ad67cf2fb577bc382d65c8b31b65091e29c5 | |
| author | David Maus <dmaus@ictsoc.de> | |
| Sun, 4 Mar 2012 19:53:05 +0000 (4 20:53 +0100) | ||
| committer | David Maus <dmaus@ictsoc.de> | |
| Sun, 4 Mar 2012 19:53:05 +0000 (4 20:53 +0100) | ||
| tree | 798f4280b535080a85862caad8bcf6a960e74e14 | treesnapshot (tar.gz zip) |
| parent | a6dad433956d33cba254b0ec3bd819aa0cd91d8f | commitdiff |
| parent | c9482d61a83ddd9ddfa205ad9831e25a51638d7d | commitdiff |
Merge branch 'maint'
org-bbdb in master already contained declare-function for external
bbdb-functions.
Conflicts:
lisp/org-bbdb.el
org-bbdb in master already contained declare-function for external
bbdb-functions.
Conflicts:
lisp/org-bbdb.el
| lisp/org-agenda.el | diff1 | diff2 | blobhistory |
| lisp/org-bbdb.el | diff1 | diff2 | blobhistory |
| lisp/org.el | diff1 | diff2 | blobhistory |