[irstlm] 85/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 6f4f6f52ca6679faee0648ca2be0bcc47ca1fa23
Merge: 08b5d6b 0986df4
Author: nicolabertoldi <bertoldi at fbk.eu>
Date:   Tue Sep 15 19:49:37 2015 +0200

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

 src/context-dependent-evaluation.cpp | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

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