Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

M

macaon2
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

faef0f16

Commit faef0f16 authored 8 years ago by Alexis Nasr

Downloads
- Plain Diff

Merge branch 'johannes' into 'master'

Johannes

See merge request !7

parents 821ec273 363c1bde

No related branches found

No related tags found

Loading

Changes 4

Show whitespace changes

Inline Side-by-side

Showing

CMakeLists.txt 2 additions, 0 deletions

CMakeLists.txt
maca_export/CMakeLists.txt 25 additions, 0 deletions

maca_export/CMakeLists.txt
maca_export/src/test.cc 39 additions, 0 deletions

maca_export/src/test.cc
maca_tokenizer/src/fr_tok_rules.l 5 additions, 0 deletions

maca_tokenizer/src/fr_tok_rules.l

with 71 additions and 0 deletions

Loading

0% Loading 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