• Matthijs Brouwer authored
     
    Browse Dir »
  • Matthijs Brouwer authored
     
    Browse Code »
  • Matthijs Brouwer authored
     
    Browse Code »
  • # Conflicts:
    #	conf/parser/mtas/crm_test.xml
    #	conf/parser/mtas/folia_ddd.xml
    #	pom.xml
    #	src/mtas/analysis/MtasTokenizer.java
    #	src/mtas/analysis/parser/MtasCRMParser.java
    #	src/mtas/analysis/token/MtasTokenCollection.java
    #	src/mtas/codec/MtasCodecPostingsFormat.java
    #	src/mtas/codec/MtasFieldsConsumer.java
    #	src/mtas/codec/util/CodecComponent.java
    #	src/mtas/codec/util/CodecInfo.java
    #	src/mtas/codec/util/DataCollector.java
    #	src/mtas/codec/util/collector/MtasDataAdvanced.java
    #	src/mtas/codec/util/collector/MtasDataBasic.java
    #	src/mtas/codec/util/collector/MtasDataDoubleAdvanced.java
    #	src/mtas/codec/util/collector/MtasDataDoubleBasic.java
    #	src/mtas/codec/util/collector/MtasDataDoubleFull.java
    #	src/mtas/codec/util/collector/MtasDataFull.java
    #	src/mtas/codec/util/collector/MtasDataItem.java
    #	src/mtas/codec/util/collector/MtasDataItemAdvanced.java
    #	src/mtas/codec/util/collector/MtasDataItemBasic.java
    #	src/mtas/codec/util/collector/MtasDataItemDoubleAdvanced.java
    #	src/mtas/codec/util/collector/MtasDataItemDoubleBasic.java
    #	src/mtas/codec/util/collector/MtasDataItemDoubleFull.java
    #	src/mtas/codec/util/collector/MtasDataItemFull.java
    #	src/mtas/codec/util/collector/MtasDataItemLongAdvanced.java
    #	src/mtas/codec/util/collector/MtasDataItemLongBasic.java
    #	src/mtas/codec/util/collector/MtasDataLongAdvanced.java
    #	src/mtas/codec/util/collector/MtasDataLongBasic.java
    #	src/mtas/codec/util/collector/MtasDataLongFull.java
    #	src/mtas/parser/cql/util/MtasCQLParserDefaultPrefixCondition.java
    #	src/mtas/parser/cql/util/MtasCQLParserSentenceCondition.java
    #	src/mtas/parser/cql/util/MtasCQLParserSentencePartCondition.java
    #	src/mtas/solr/handler/component/MtasSolrSearchComponent.java
    #	src/mtas/solr/search/MtasCQLQParser.java
    #	src/mtas/solr/update/processor/MtasUpdateRequestProcessorFactory.java
    #	src/mtas/solr/update/processor/MtasUpdateRequestProcessorResultWriter.java
    #	src/site/markdown/download.md.vm
    #	src/site/markdown/index.md
    #	src/site/markdown/installation.md
    #	src/site/markdown/installation_lucene.md
    #	src/site/markdown/installation_solr.md
    #	src/site/site.xml
    Matthijs Brouwer authored
     
    Browse Dir »
  • Matthijs Brouwer authored
     
    Browse File »