projects / notmuch.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 38546e4 ffce9b7)
Merge branch 'release'
authorDavid Bremner <bremner@debian.org>
Sat, 14 Jan 2012 00:52:01 +0000 (20:52 -0400)
committerDavid Bremner <bremner@debian.org>
Sat, 14 Jan 2012 00:52:01 +0000 (20:52 -0400)
Conflicts:
notmuch-reply.c
notmuch.1

1  2 
emacs/notmuch-show.el patch | diff1 | diff2 | blob | history
test/emacs patch | diff1 | diff2 | blob | history

diff --cc emacs/notmuch-show.el
Simple merge
diff --cc test/emacs
Simple merge
Thread-based e-mail indexer, supporting quick search and tagging