summaryrefslogtreecommitdiff
path: root/backend/sm3600-scanutil.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/sm3600-scanutil.c
parent5793a221e112fa49073de0137d6bfa750a61b0a1 (diff)
parentecaaf250cb33ff61f37a7b441f2337584a655350 (diff)
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'backend/sm3600-scanutil.c')
-rw-r--r--backend/sm3600-scanutil.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/backend/sm3600-scanutil.c b/backend/sm3600-scanutil.c
index 022984e..6fe67ed 100644
--- a/backend/sm3600-scanutil.c
+++ b/backend/sm3600-scanutil.c
@@ -13,9 +13,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.
@@ -43,8 +41,6 @@
Userspace scan tool for the Microtek 3600 scanner
-$Id$
-
====================================================================== */
#include <unistd.h>
@@ -85,7 +81,7 @@ void debug_printf(unsigned long ulType, const char *szFormat, ...)
SetError(error, format, ...)
-The program is aborted, all handles and ressources are freed (this
+The program is aborted, all handles and resources are freed (this
being global) and the user gets a nice panic screen :-)
********************************************************************** */