Commit Graph

4 Commits

Author SHA1 Message Date
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
Matthias Beyer eb32027546 Add test setup with first test 2017-09-01 20:35:30 +02:00
Matthias Beyer 90b3ae1f70 Add base types for the API 2017-09-01 20:35:30 +02:00
Matthias Beyer fb2dd3017a Initial import 2017-09-01 20:35:30 +02:00