diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2021-02-16 18:25:42 +0100 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2021-02-16 18:25:42 +0100 |
| commit | 64ddd1a4dfcefd11f662f5cf4bb05b590d901a97 (patch) | |
| tree | 4303648095deff998ae20c2393b56db527742ac9 /ChangeLogs/ChangeLog-1.0.25 | |
| parent | 5793a221e112fa49073de0137d6bfa750a61b0a1 (diff) | |
| parent | ecaaf250cb33ff61f37a7b441f2337584a655350 (diff) | |
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'ChangeLogs/ChangeLog-1.0.25')
| -rw-r--r-- | ChangeLogs/ChangeLog-1.0.25 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ChangeLogs/ChangeLog-1.0.25 b/ChangeLogs/ChangeLog-1.0.25 index 4863d50..bdc44ec 100644 --- a/ChangeLogs/ChangeLog-1.0.25 +++ b/ChangeLogs/ChangeLog-1.0.25 @@ -70,7 +70,7 @@ 2015-08-08 Stéphane Voltz <stef.dev@free.fr> * backend/test.c: fix memleaks (#313553) - * configure.in, configure: don not harcode -I/usr/local/include + * configure.in, configure: don not hardcode -I/usr/local/include (#315060) open/close tests. @@ -286,7 +286,7 @@ 2014-08-23 Louis Lagendijk <louis dot lagendijk at gmail dot com> * backend/pixma_bjnp.c: - * Keep TCP-connection closed untill we really need it. This avoids + * Keep TCP-connection closed until we really need it. This avoids the scanner closing the TCP-connection when idle * Add an explicit error message when we detect that the scanner closed the TCP-connection |