Skip to content
Commit c784e82d authored by Rolf Bensch's avatar Rolf Bensch
Browse files

Merge branch 'master' into 'master' 

pixma: Added Canon LiDE 400

See merge request !36
parents 2b0c7a31 d9784940
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment