[irstlm] 83/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 08b5d6bf7b97afd61989f588d4039ffec8cec2e5
Merge: 066f290 8622b16
Author: nicolabertoldi <bertoldi at fbk.eu>
Date:   Mon Sep 14 16:47:39 2015 +0200

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

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

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