diff options
| author | Roman Grundkiewicz <rogrundk@microsoft.com> | 2020-07-26 01:00:10 +0300 |
|---|---|---|
| committer | Martin Junczys-Dowmunt <Marcin.JunczysDowmunt@microsoft.com> | 2020-07-26 01:00:10 +0300 |
| commit | 900147714737ce35828c905eee2879afecc2ccef (patch) | |
| tree | a549669b7cbe0eba1b3c7731b08c5777dc50901a | |
| parent | 71dccf343e1fced17fcbeb158f844e80963ddaae (diff) | |
Merged PR 14060: Sync with public marian-dev master v1.9.26
This PR pulls recent changes from the public repo.
In particular, it adds back the submodule for marian-server, which has been accidentally removed during the last sync into the public marian-dev. See the original PR in the public repo: https://github.com/marian-nmt/marian-dev/pull/673
| -rw-r--r-- | VERSION | 2 | ||||
| m--------- | src/3rd_party/fbgemm | 0 | ||||
| m--------- | src/3rd_party/simple-websocket-server | 0 |
3 files changed, 1 insertions, 1 deletions
@@ -1,2 +1,2 @@ -v1.9.25 +v1.9.26 diff --git a/src/3rd_party/fbgemm b/src/3rd_party/fbgemm -Subproject 5454259a1890888daba43a55c90e455fc120466 +Subproject da28b0abb0e54f4ed6e1444309e23879018689d diff --git a/src/3rd_party/simple-websocket-server b/src/3rd_party/simple-websocket-server new file mode 160000 +Subproject 417a2a9e9dbd720b8d2dfa1dafe57cf1b37ca0d |