You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@joshua.apache.org by mj...@apache.org on 2016/08/30 13:03:57 UTC

[4/4] incubator-joshua git commit: Merge branch 'master' into 7

Merge branch 'master' into 7


Project: http://git-wip-us.apache.org/repos/asf/incubator-joshua/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-joshua/commit/bb3c3004
Tree: http://git-wip-us.apache.org/repos/asf/incubator-joshua/tree/bb3c3004
Diff: http://git-wip-us.apache.org/repos/asf/incubator-joshua/diff/bb3c3004

Branch: refs/heads/7
Commit: bb3c3004e30a86628c3725bcd90ae4e93d9c424d
Parents: 0b54327 9385cf7
Author: Matt Post <po...@cs.jhu.edu>
Authored: Tue Aug 30 09:03:44 2016 -0400
Committer: Matt Post <po...@cs.jhu.edu>
Committed: Tue Aug 30 09:03:44 2016 -0400

----------------------------------------------------------------------
 .travis.yml       |  2 ++
 jni/kenlm_wrap.cc | 33 +++++++++++++++++++++++----------
 2 files changed, 25 insertions(+), 10 deletions(-)
----------------------------------------------------------------------