Merge remote-tracking branch 'upstream/master' into new

ocropus · May 13, 2016 · 8fd1695 · 8fd1695
2 parents 556e5c1 + 839945b
commit 8fd1695
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/LICENSE b/LICENSE
@@ -0,0 +1,13 @@
+Copyright 2013 Thomas M. Breuel
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
diff --git a/README.md b/README.md
@@ -89,7 +89,6 @@ source venv/bin/activate
 
 Included command line programs:
 
-
 ### hocr-check
 
 ```
@@ -173,4 +172,3 @@ hocr-split file.html pattern
 
 Split a multipage hOCR file into hOCR files containing one page each.
 The pattern should something like "base-%03d.html"
-