imag/lib/domain/libimagdiary/src
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
..
config.rs Reorganize code in subdirs 2017-08-27 15:12:09 +02:00
diary.rs Merge branch 'master' into libimagerror/integration 2017-09-04 23:02:45 +02:00
diaryid.rs Remove "IntoError" trait, use error_chain functionality 2017-09-03 21:34:07 +02:00
entry.rs Merge branch 'master' into libimagerror/integration 2017-09-04 23:02:45 +02:00
error.rs Merge branch 'master' into libimagerror/integration 2017-09-04 23:02:45 +02:00
is_in_diary.rs Add another small helper 2017-09-01 11:04:07 +02:00
iter.rs Merge branch 'master' into libimagerror/integration 2017-09-04 23:02:45 +02:00
lib.rs Remove dedicated result modules, use error chain generated Result types 2017-09-04 09:19:29 +02:00
viewer.rs Merge branch 'master' into libimagerror/integration 2017-09-04 23:02:45 +02:00