projects / yaz-moved-to-github.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 91dee59 45beb75)
Merge branch 'solr_client' of ssh://git.indexdata.com/home/git/pub/yaz into solr_client
authorDennis Schafroth <dennis@indexdata.com>
Mon, 16 Aug 2010 09:01:09 +0000 (11:01 +0200)
committerDennis Schafroth <dennis@indexdata.com>
Mon, 16 Aug 2010 09:01:09 +0000 (11:01 +0200)
Conflicts:
test/Makefile.am

1  2 
test/test_rpn2solr.c patch | diff1 | diff2 | blob | history

diff --cc test/test_rpn2solr.c
Simple merge
Z39.50 C library