Merge branch 'master' into iob-chan (0e0a9d81) · Commits · Analysers / corpus2 · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

C

corpus2
- Activity
- Members
- Labels
- Issues
  4
- Issue boards
- Milestones
- Wiki
- Redmine
- Releases
- Container Registry
- Environments
- Incidents

Snippets Groups Projects

0e0a9d81

Commit 0e0a9d81 authored 13 years ago by

ilor

Downloads
- Plain Diff

Merge branch 'master' into iob-chan

parents ae9581dd 2b8f6a60

Branches

Changes 16

Hide whitespace changes

Inline Side-by-side

Showing

CMakeLists.txt 2 additions, 2 deletions

CMakeLists.txt
corpus2tools/CMakeLists.txt 5 additions, 3 deletions

corpus2tools/CMakeLists.txt
corpus2tools/corpus-get.cpp 77 additions, 0 deletions

corpus2tools/corpus-get.cpp
corpus2tools/tagset-tool.cpp 0 additions, 0 deletions

corpus2tools/tagset-tool.cpp
doc/corpstats.py 101 additions, 0 deletions

doc/corpstats.py
libcorpus2/CMakeLists.txt 2 additions, 0 deletions

libcorpus2/CMakeLists.txt
libcorpus2/io/helpers.cpp 22 additions, 0 deletions

libcorpus2/io/helpers.cpp
libcorpus2/io/helpers.h 16 additions, 0 deletions

libcorpus2/io/helpers.h
libcorpus2/io/rft.cpp 15 additions, 2 deletions

libcorpus2/io/rft.cpp
libcorpus2/io/rft.h 3 additions, 0 deletions

libcorpus2/io/rft.h
libcorpus2/util/ioformat-options.cpp 66 additions, 0 deletions

libcorpus2/util/ioformat-options.cpp
libcorpus2/util/ioformat-options.h 34 additions, 0 deletions

libcorpus2/util/ioformat-options.h
swig/CMakeLists.txt 10 additions, 7 deletions

swig/CMakeLists.txt
swig/boost_shared_ptr.i 8 additions, 0 deletions

swig/boost_shared_ptr.i
swig/libcorpuschunk.i 1 addition, 0 deletions

swig/libcorpuschunk.i
swig/libcorpustokenreader.i 19 additions, 2 deletions

swig/libcorpustokenreader.i

with 381 additions and 16 deletions

0% or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment