DWDS/Dialing Concordance Code

a collection of indexing and search tools for corpus linguists

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

Commit [r1300] Maximize Restore History

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

Authored by: mukau 2019-11-01

Browse code at this revision

Parent: [r1299]

Child: [r1301]

1 2 > >> (Page 1 of 2)

changed	/ddc/branches/delwin-merge
changed	/ddc/branches/delwin-merge/src/CommonLib/Makefile.am
changed	/ddc/branches/delwin-merge/src/CommonLib/util_classes.h
changed	/ddc/branches/delwin-merge/src/ConcordDmnLib/LeafServer.cpp
removed	/ddc/branches/delwin-merge/src/ConcordLib/Bibliography.cpp
removed	/ddc/branches/delwin-merge/src/ConcordLib/Bibliography.h
changed	/ddc/branches/delwin-merge/src/ConcordLib/CMakeLists.txt
changed	/ddc/branches/delwin-merge/src/ConcordLib/ConcCommon.h
changed	/ddc/branches/delwin-merge/src/ConcordLib/ConcIndexator.cpp
changed	/ddc/branches/delwin-merge/src/ConcordLib/ConcSession.cpp
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/ConcordUnion.cpp
changed	/ddc/branches/delwin-merge/src/ConcordLib/Concordance.cpp
changed	/ddc/branches/delwin-merge/src/ConcordLib/Concordance.h
changed	/ddc/branches/delwin-merge/src/ConcordLib/IndexMorphXml.cpp
changed	/ddc/branches/delwin-merge/src/ConcordLib/Makefile.am
changed	/ddc/branches/delwin-merge/src/ConcordLib/QCount.cpp
copied	/ddc/branches/delwin/src/CommonLib/ptrholder.h -> /ddc/branches/delwin-merge/src/CommonLib/ptrholder.h
copied	/ddc/branches/delwin/src/ConcordLib/ConcXml.cpp -> /ddc/branches/delwin-merge/src/ConcordLib/ConcXml.cpp
copied	/ddc/branches/delwin/src/ConcordLib/ConcXml.h -> /ddc/branches/delwin-merge/src/ConcordLib/ConcXml.h
copied	/ddc/branches/delwin/src/ConcordLib/DocumentIterator.cpp -> /ddc/branches/delwin-merge/src/ConcordLib/DocumentIterator.cpp
copied	/ddc/branches/delwin/src/ConcordLib/DocumentIterator.h -> /ddc/branches/delwin-merge/src/ConcordLib/DocumentIterator.h
copied	/ddc/branches/delwin/src/ConcordLib/FreeBiblIndex.cpp -> /ddc/branches/delwin-merge/src/ConcordLib/FreeBiblIndex.cpp
copied	/ddc/branches/delwin/src/ConcordLib/FreeBiblIndex.h -> /ddc/branches/delwin-merge/src/ConcordLib/FreeBiblIndex.h

/ddc/branches/delwin-merge

Directory.

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

/ddc/branches/delwin-merge/src/CommonLib/util_classes.h Diff Switch to side-by-side view

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

/ddc/branches/delwin-merge/src/ConcordLib/Bibliography.cpp

File was removed.

/ddc/branches/delwin-merge/src/ConcordLib/Bibliography.h

File was removed.

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

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

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

/ddc/branches/delwin-merge/src/ConcordLib/ConcSession.cpp 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/ConcordUnion.cpp Diff Switch to side-by-side view

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

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

/ddc/branches/delwin-merge/src/ConcordLib/IndexMorphXml.cpp 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/ConcordLib/QCount.cpp Diff Switch to side-by-side view

/ddc/branches/delwin/src/CommonLib/ptrholder.h to /ddc/branches/delwin-merge/src/CommonLib/ptrholder.h

File was copied.

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

File was copied.

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

File was copied.

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

File was copied.

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

File was copied.

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

File was copied.

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

File was copied.

1 2 > >> (Page 1 of 2)