[irstlm] 68/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 4184705cb5fa54e4cb683863b1399580b4d71082
Merge: 469c994 2a13292
Author: nicolabertoldi <bertoldi at fbk.eu>
Date:   Thu Sep 10 10:31:50 2015 +0200

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

 src/context-dependent-evaluation.cpp | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

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