DWDS/Dialing Concordance Code

a collection of indexing and search tools for corpus linguists

Brought to you by: garabik, kzimmer, mukau, sokirko

* merged trunk changes -r 796:797 into 2.1.0-rc1

Authored by: mukau 2016-12-21

changed	/ddc/tags/ddc-2.1.0-rc1
changed	/ddc/tags/ddc-2.1.0-rc1/src/ConcordLib/ConcHolder.h
changed	/ddc/tags/ddc-2.1.0-rc1/src/ConcordLib/ConcordOptions.cpp
changed	/ddc/tags/ddc-2.1.0-rc1/src/ddc_daemon/ddc_daemon.cpp
changed	/ddc/tags/ddc-2.1.0-rc1/src/ddc_simple/ddc_simple.cpp

Directory.