From: Daniel Axtens <dja@ucc.asn.au>
Date: Fri, 30 Sep 2011 16:52:02 +0000 (+0800)
Subject: Merge remote branch 'remotes/origin/ocropus'
X-Git-Url: https://git.ucc.asn.au/?p=dja%2Fscandal.git;a=commitdiff_plain;h=8fe732e83a703d38e483d0925f0c3bc1b2683910;hp=d3130f66fba75ba0fefa6bf6a85c11f6c0c3a96b

Merge remote branch 'remotes/origin/ocropus'

* remotes/origin/ocropus:
  Don't try full ocr, it's useless.
  change bebook optimisation to simple trim. still needs work.
  Fix issue where entire physical pages would disappear.
  Don't redo binarise if not needed.
  Do less with unpaper.
  Update docs, various fixes.
  ocropus as soon as possible
---

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..e43b0f9
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+.DS_Store
diff --git a/architecture.txt b/architecture.txt
index 5646a24..981d872 100644
--- a/architecture.txt
+++ b/architecture.txt
@@ -35,3 +35,4 @@ Anything we attempt to detect automatically should have the option to set manual
 	* an option to set a default and certain exceptions would be ace.
  - options for final output
  - options to ignore partial products
+ - more debug options