summaryrefslogtreecommitdiff
path: root/ChangeLogs/ChangeLog-1.0.1
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.1
parent5793a221e112fa49073de0137d6bfa750a61b0a1 (diff)
parentecaaf250cb33ff61f37a7b441f2337584a655350 (diff)
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'ChangeLogs/ChangeLog-1.0.1')
-rw-r--r--ChangeLogs/ChangeLog-1.0.14
1 files changed, 2 insertions, 2 deletions
diff --git a/ChangeLogs/ChangeLog-1.0.1 b/ChangeLogs/ChangeLog-1.0.1
index c83de5d..5a6d7c2 100644
--- a/ChangeLogs/ChangeLog-1.0.1
+++ b/ChangeLogs/ChangeLog-1.0.1
@@ -114,7 +114,7 @@
* backend/Makefile.in (V_REV): New variable.
* configure.in (V_REV): New variable.
- (VERSION): Include ${V_REV} in vesion number.
+ (VERSION): Include ${V_REV} in version number.
Substitute V_REV.
* backend/umax.c (umax_do_request_sense): Make "static".
@@ -357,7 +357,7 @@
* include/sane/sane.h (SANE_CURRENT_MAJOR): SANE_CURRENT_MAJOR and
V_MAJOR HAVE to be in sync, so I'm forced to fix SANE_CURRENT_MAJOR
- now. Embarassing, but fortunately only the snapscan backend seems
+ now. Embarrassing, but fortunately only the snapscan backend seems
affected by this change.
* backend/dll.c (load): Use SANE_CURRENT_MAJOR, not V_MAJOR (the