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 /backend/snapscan.h | |
parent | 5793a221e112fa49073de0137d6bfa750a61b0a1 (diff) | |
parent | ecaaf250cb33ff61f37a7b441f2337584a655350 (diff) |
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'backend/snapscan.h')
-rw-r--r-- | backend/snapscan.h | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/backend/snapscan.h b/backend/snapscan.h index 19a9fb5..02d8bf9 100644 --- a/backend/snapscan.h +++ b/backend/snapscan.h @@ -18,9 +18,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. @@ -44,10 +42,12 @@ If you do not wish that, delete this exception notice. This file is a component of the implementation of a backend for many - of the AGFA SnapScan and Acer Vuego/Prisa flatbed scanners. */ + of the AGFA SnapScan and Acer Vuego/Prisa flatbed scanners. +*/ -/* $Id$ - SANE SnapScan backend */ +/* + SANE SnapScan backend +*/ #ifndef snapscan_h #define snapscan_h @@ -437,7 +437,6 @@ struct snapscan_scanner #endif /* - * $Log$ * Revision 1.42 2008/05/15 12:50:24 ellert-guest * Fix for bug #306751: sanei-thread with pthreads on 64 bit * @@ -586,7 +585,7 @@ struct snapscan_scanner * * Revision 1.15 2001/09/18 15:01:07 oliverschwartz * - Read scanner id string again after firmware upload - * to indentify correct model + * to identify correct model * - Make firmware upload work for AGFA scanners * - Change copyright notice * @@ -622,7 +621,7 @@ struct snapscan_scanner * Adding USB files for optional USB compiles. * * Revision 1.4 2000/10/13 03:50:27 cbagwell - * Updating to source from SANE 1.0.3. Calling this versin 1.1 + * Updating to source from SANE 1.0.3. Calling this version 1.1 * * Revision 1.3 2000/08/12 15:09:37 pere * Merge devel (v1.0.3) into head branch. |