Merge branch 'master' of github.com:marian-nmt/marian

marian-nmt · Nov 21, 2017 · 4874c0d · 4874c0d
2 parents 3a80bd2 + 6a8a394
commit 4874c0d
Show file tree

Hide file tree

Showing 42 changed files with 970 additions and 12,921 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -2,3 +2,6 @@
 	path = src/marian
 	url = https://github.com/marian-nmt/marian-dev
 	branch = stable
+[submodule "examples"]
+	path = examples
+	url = https://github.com/marian-nmt/marian-examples.git
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-v0.0.0-test+3.13905be*v0.0.0-test*0*0*0*test*3*13905be
+v1.0.0
diff --git a/examples/training/.gitignore b/examples/training/.gitignore
diff --git a/examples/training/LICENSE b/examples/training/LICENSE
diff --git a/examples/training/README.md b/examples/training/README.md
diff --git a/examples/training/clean.sh b/examples/training/clean.sh
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		v0.0.0-test+3.13905bev0.0.0-test000test3*13905be
		v1.0.0