summaryrefslogtreecommitdiff
path: root/ChangeLogs/ChangeLog-1.0.28
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2021-02-16 18:25:42 +0100
committerJörg Frings-Fürst <debian@jff-webhosting.net>2021-02-16 18:25:42 +0100
commit64ddd1a4dfcefd11f662f5cf4bb05b590d901a97 (patch)
tree4303648095deff998ae20c2393b56db527742ac9 /ChangeLogs/ChangeLog-1.0.28
parent5793a221e112fa49073de0137d6bfa750a61b0a1 (diff)
parentecaaf250cb33ff61f37a7b441f2337584a655350 (diff)
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'ChangeLogs/ChangeLog-1.0.28')
-rw-r--r--ChangeLogs/ChangeLog-1.0.2810
1 files changed, 5 insertions, 5 deletions
diff --git a/ChangeLogs/ChangeLog-1.0.28 b/ChangeLogs/ChangeLog-1.0.28
index 0a161f1..43479fa 100644
--- a/ChangeLogs/ChangeLog-1.0.28
+++ b/ChangeLogs/ChangeLog-1.0.28
@@ -2411,7 +2411,7 @@ Date: 2019-03-08 20:56:26 +0000
Merge branch 'master' into 'master'
- Add Driver Canon Pixma TS 6200 Serie.
+ Add Driver Canon Pixma TS 6200 Series.
See merge request sane-project/backends!43
@@ -2425,7 +2425,7 @@ commit 2915756ae4262b6a87490b5d96959f58c498307b
Author: Thierry <thierry@substantiel.fr>
Date: 2019-03-05 08:43:31 +0100
- Add Driver Canon Pixma TS 6200 Serie.
+ Add Driver Canon Pixma TS 6200 Series.
commit 9e4344b33a2d83aa7663b65d6d8a49c7306d72c7
Author: Rolf Bensch <rolf@bensch-online.de>
@@ -2513,7 +2513,7 @@ commit 941f6bb3808fd45760ab0cf0fa0cf53a6f197986
Author: m. allan noah <kitno455@gmail.com>
Date: 2019-02-23 14:54:48 -0500
- remove nonexistant scanners
+ remove nonexistent scanners
the fi-6125 and 6135 were never released, though they showed in
some old versions of the windows driver. here, we remove them.
@@ -4140,7 +4140,7 @@ Date: 2017-07-15 14:47:54 +0900
Not all pthreads implementations use an integer type for pthread_t.
As a matter of fact, POSIX has explicitly withdrawn the requirement
- that it must be an arithmatic type.
+ that it must be an arithmetic type.
The musl C library uses a `struct __pthread *` which triggered the
warnings. As of this change, sanei_thread.h works around this by
@@ -4245,7 +4245,7 @@ Date: 2017-06-26 19:13:51 +0900
to enumeration constants by ISO C99.
Seeing that the _PS_INP* values appear to be bitflags (despite the
- arithmatic additions in backend/plustek-usbdev.c!) it is safer to
+ arithmetic additions in backend/plustek-usbdev.c!) it is safer to
use #defines instead of an enum.
commit a74cb99c1aa3dbddf0bb8250a9b2af72584d9b42