[irstlm] 53/126: Merge branch 'context-dependent' of https://github.com/irstlm-team/irstlm into context-dependent

[Giulio Paci]

This is an automated email from the git hooks/post-receive script.

giuliopaci-guest pushed a commit to annotated tag adaptiveLM.v0.1
in repository irstlm.

commit 45daa27620bdd1d6a8caad20c452d3d59969e8eb
Merge: cffac67 dad1035
Author: nicolabertoldi <bertoldi at fbk.eu>
Date:   Wed Aug 19 18:34:17 2015 +0200

    Merge branch 'context-dependent' of https://github.com/irstlm-team/irstlm into context-dependent

 CMakeLists.txt             |  1 +
 README.md                  | 10 +++++
 src/CMakeLists.txt         | 14 ++++++-
 src/context-similarity.cpp | 99 ++++++++++++++++++++++++++--------------------
 src/context-similarity.h   |  4 +-
 5 files changed, 83 insertions(+), 45 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/irstlm.git