DWDS/Dialing Concordance Code

a collection of indexing and search tools for corpus linguists

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

Commit [r1303] Maximize Restore History

review: merged r1260:1263 from 'delwin' branch into delwin-merge (resolved more ConcordOptions.cpp conflicts)

Authored by: mukau 2019-11-04

Browse code at this revision

Parent: [r1302]

Child: [r1304]

changed	/ddc/branches/delwin-merge
changed	/ddc/branches/delwin-merge/src/ConcordLib/CMakeLists.txt
changed	/ddc/branches/delwin-merge/src/ConcordLib/ConcXml.cpp
changed	/ddc/branches/delwin-merge/src/ConcordLib/ConcXml.h
changed	/ddc/branches/delwin-merge/src/ConcordLib/ConcordOptions.cpp
changed	/ddc/branches/delwin-merge/src/ConcordLib/ConcordSplit.cpp
changed	/ddc/branches/delwin-merge/src/ConcordLib/HitBorder.cpp
changed	/ddc/branches/delwin-merge/src/ConcordLib/HitBorder.h
changed	/ddc/branches/delwin-merge/src/ConcordLib/Makefile.am
changed	/ddc/branches/delwin-merge/src/ddc_split/ddc_split.cpp
changed	/ddc/branches/delwin-merge/src/tests/CMakeLists.txt
copied	/ddc/branches/delwin/src/ConcordLib/BiblIndex.cpp -> /ddc/branches/delwin-merge/src/ConcordLib/BiblIndex.cpp
copied	/ddc/branches/delwin/src/ConcordLib/BiblIndex.h -> /ddc/branches/delwin-merge/src/ConcordLib/BiblIndex.h
copied	/ddc/branches/delwin/src/tests/splitjoin -> /ddc/branches/delwin-merge/src/tests/splitjoin

/ddc/branches/delwin-merge

Directory.

/ddc/branches/delwin-merge/src/ConcordLib/CMakeLists.txt Diff Switch to side-by-side view

/ddc/branches/delwin-merge/src/ConcordLib/ConcXml.cpp Diff Switch to side-by-side view

/ddc/branches/delwin-merge/src/ConcordLib/ConcXml.h Diff Switch to side-by-side view

/ddc/branches/delwin-merge/src/ConcordLib/ConcordOptions.cpp Diff Switch to side-by-side view

/ddc/branches/delwin-merge/src/ConcordLib/ConcordSplit.cpp Diff Switch to side-by-side view

/ddc/branches/delwin-merge/src/ConcordLib/HitBorder.cpp Diff Switch to side-by-side view

/ddc/branches/delwin-merge/src/ConcordLib/HitBorder.h Diff Switch to side-by-side view

/ddc/branches/delwin-merge/src/ConcordLib/Makefile.am Diff Switch to side-by-side view

/ddc/branches/delwin-merge/src/ddc_split/ddc_split.cpp Diff Switch to side-by-side view

/ddc/branches/delwin-merge/src/tests/CMakeLists.txt Diff Switch to side-by-side view

/ddc/branches/delwin/src/ConcordLib/BiblIndex.cpp to /ddc/branches/delwin-merge/src/ConcordLib/BiblIndex.cpp

File was copied.

/ddc/branches/delwin/src/ConcordLib/BiblIndex.h to /ddc/branches/delwin-merge/src/ConcordLib/BiblIndex.h

File was copied.

/ddc/branches/delwin/src/tests/splitjoin to /ddc/branches/delwin-merge/src/tests/splitjoin

File was copied.