projects / notmuch.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8b10e4d 2d69aba)
Merge commit '0.6.1'
authorDavid Bremner <bremner@debian.org>
Mon, 18 Jul 2011 01:18:58 +0000 (22:18 -0300)
committerDavid Bremner <bremner@debian.org>
Mon, 18 Jul 2011 01:20:37 +0000 (22:20 -0300)
Conflicts:
lib/Makefile.local

The conflicts are from three kinds of commits not merged into release:
    - typo fixes
    - removal of debug output
    - fix for CLEAN rule

That were never merged into the release branch.

1  2 
lib/Makefile.local patch | diff1 | diff2 | blob | history

diff --cc lib/Makefile.local
Simple merge
Thread-based e-mail indexer, supporting quick search and tagging