summaryrefslogtreecommitdiff
path: root/backend/canon630u-common.c
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 /backend/canon630u-common.c
parent5793a221e112fa49073de0137d6bfa750a61b0a1 (diff)
parentecaaf250cb33ff61f37a7b441f2337584a655350 (diff)
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'backend/canon630u-common.c')
-rw-r--r--backend/canon630u-common.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/backend/canon630u-common.c b/backend/canon630u-common.c
index 5cd0fcf..e6fcf33 100644
--- a/backend/canon630u-common.c
+++ b/backend/canon630u-common.c
@@ -12,9 +12,7 @@
General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- MA 02111-1307, USA.
+ along with this program. If not, see <https://www.gnu.org/licenses/>.
As a special exception, the authors of SANE give permission for
additional uses of the libraries contained in this release of SANE.
@@ -719,7 +717,7 @@ wait_for_return (int fd)
static SANE_Status compute_ogn (char *calfilename);
-/* This is the calibration rountine Win2k goes through when the scanner is
+/* This is the calibration routine Win2k goes through when the scanner is
first plugged in.
Original usb trace from Win2k with USBSnoopy ("usb sniffer for w2k"
http://benoit.papillault.free.fr/speedtouch/sniff-2000.en.php3)