Merge branch 'master' into stemming
authorDennis Schafroth <dennis@indexdata.com>
Mon, 8 Nov 2010 17:05:54 +0000 (18:05 +0100)
committerDennis Schafroth <dennis@indexdata.com>
Mon, 8 Nov 2010 17:05:54 +0000 (18:05 +0100)
commit9e04bbdbec82ea6f5795dc2d16bd9876ecc7762f
tree6e570c00de9dec62df8d0890e0dcd6bfc940505e
parente1ad0cf93484f86cbdcd53c73219eef124332dfc
parent29fc3c6ee42b1c1bd2200c950393326007fa0d83
Merge branch 'master' into stemming

Conflicts:
src/icu_chain.c

Merge minor ICU change and test changes.

Fix includes to include config.h.
Fix Makefile: Include stemmer in libyaz_icu.
include/yaz/stemmer.h
src/Makefile.am
src/icu_chain.c
src/stemmer.c