Matthias Beyer c115215fa4 Merge branch 'master' into libimagerror/integration ... This merge solved a _LOT_ of conflicts and was a rather complicated one, as parts of the conflict-resolution involved rewriting of half the stuff. This merge commit fixes all the things so a `cargo check --all` succeeds, but I did not yet check whether tests run without failure.		2017-09-04 23:02:45 +02:00
..
src	Merge branch 'master' into libimagerror/integration	2017-09-04 23:02:45 +02:00
Cargo.toml	Merge branch 'master' into libimagerror/integration	2017-09-04 23:02:45 +02:00