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/21 17:42:21 UTC
[12/22] incubator-joshua git commit: Merge branch 'demo'
Merge branch 'demo'
Project: http://git-wip-us.apache.org/repos/asf/incubator-joshua/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-joshua/commit/2e2ee09b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-joshua/tree/2e2ee09b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-joshua/diff/2e2ee09b
Branch: refs/heads/JOSHUA-284
Commit: 2e2ee09b725f2182413219e406ba3fca9d71c00f
Parents: 3e2e053 47f4c96
Author: Matt Post <po...@cs.jhu.edu>
Authored: Wed Aug 17 06:46:07 2016 -0400
Committer: Matt Post <po...@cs.jhu.edu>
Committed: Wed Aug 17 06:46:07 2016 -0400
----------------------------------------------------------------------
demo/README.md | 2 +-
demo/apache_joshua_logo.png | Bin 0 -> 306617 bytes
demo/apache_joshua_logo_faded.png | Bin 0 -> 309216 bytes
demo/demo.config | 3 ++
demo/demo.js | 19 +++++++---
demo/index.html | 37 +++++++++----------
.../joshua/decoder/StructuredTranslation.java | 7 ++--
.../decoder/StructuredTranslationFactory.java | 4 +-
.../apache/joshua/decoder/io/JSONMessage.java | 2 +-
.../org/apache/joshua/server/ServerThread.java | 9 +++--
10 files changed, 46 insertions(+), 37 deletions(-)
----------------------------------------------------------------------