From: Adam Dickmeiss <adam@indexdata.dk>
Date: Wed, 7 Jul 2010 08:45:07 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/yaz
X-Git-Tag: v4.0.11~5
X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=commitdiff_plain;h=5cf76d0f27403990896771b870e833605a7f87f6;hp=-c

Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/yaz
---

5cf76d0f27403990896771b870e833605a7f87f6
diff --combined src/Makefile.am
index 81694d3,46c0168..2e5cec2
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@@ -10,7 -10,7 +10,7 @@@ dist-hook
  
  tabdatadir = $(pkgdatadir)/z39.50
  tabdata_DATA=datetime.asn esupdate.asn univres.asn z3950v3.asn z.tcl \
 - esadmin.asn charneg-3.asn mterm2.asn oclcui.asn
 + esadmin.asn charneg-3.asn mterm2.asn oclcui.asn facet.asn
  
  illdatadir=$(pkgdatadir)/ill
  illdata_DATA=ill9702.asn item-req.asn ill.tcl oclc-ill-req-ext.asn
@@@ -63,7 -63,7 +63,7 @@@ diagsru_update.c $(top_srcdir)/include/
  GEN_FILES = oid_std.c \
    marc8.c marc8r.c iso5426.c \
    diagbib1.c diagsrw.c diagsru_update.c \
-   z-accdes1.c z-accform1.c z-acckrb1.c z-core.c \
+   z-accdes1.c z-accform1.c z-acckrb1.c z-core.c z-facet-1.c \
    z-diag1.c z-espec1.c z-estask.c z-exp.c z-grs.c z-mterm2.c z-opac.c \
    z-uifr1.c z-rrf1.c z-rrf2.c z-sum.c z-sutrs.c z-oclcui.c\
    zes-expi.c zes-exps.c zes-order.c zes-pquery.c zes-psched.c \