[irstlm] 70/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 641c15378c0eb2abd14bb5b856cc8d2951eca64e
Merge: 4184705 96b69f6
Author: nicolabertoldi <bertoldi at fbk.eu>
Date:   Thu Sep 10 10:58:45 2015 +0200

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

 src/context-dependent-evaluation.cpp | 38 ++++++++++++++++++++----------------
 1 file changed, 21 insertions(+), 17 deletions(-)

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