Merge branch 'feature/upstream' into develop

1 files changed, 8 insertions, 8 deletions

diff --git a/doc/gt68xx/gt68xx.CHANGES b/doc/gt68xx/gt68xx.CHANGES
index 43f2e85..aa87504 100644
--- a/doc/gt68xx/gt68xx.CHANGES
+++ b/doc/gt68xx/gt68xx.CHANGES
@@ -17,7 +17,7 @@ V 1.0.82 (2006-10-03)
 V 1.0.81 (2006-05-21)
 
 * Added support for Plustek OpticPro S24 (some models). Added .conf entry for
-  Plustek OpticPro S12. 
+  Plustek OpticPro S12.
 
 V 1.0.80 (2006-01-02)
 
@@ -34,7 +34,7 @@ V 1.0.79 (2005-12-09) sane-backends 1.0.17
   scanners are not detected anymore after closing the device.
 * Fixed wait_lamp_stable. Wait for a maximum time of 60 seconds. Print
   warming up message after 5 seconds. Print how long warming up took.
-* For Mustek ScanExpress A3 USB, use more intelligent warm-up mechanism. The 
+* For Mustek ScanExpress A3 USB, use more intelligent warm-up mechanism. The
   brightness for this scanner first decreases and then increases again. With the
   previous logic the scanner always warmed up for at least 10 seconds even if it
   wasn't necessary.
@@ -50,7 +50,7 @@ V 1.0.78 (2005-10-16)
 V 1.0.77 (2005-09-29)
 
 * Added support for Plustek OpticSlim M12 (untested). Based on patch from
-  Gerhard Jaeger <gerhard@gjaeger.de>. 
+  Gerhard Jaeger <gerhard@gjaeger.de>.
 * Fixed gt68xx homepage links in man page. Changed minimum version of libusb
   to 0.1.8.
 
@@ -290,7 +290,7 @@ V 1.0-55 (2004-03-06)
 * Added detection for Genius Vivid 1200 EX.
 * Fixed product id of Mustek BearPaw 2448 TA Plus.
 * Other minor updates.
- 
+
 V 1.0-54 (2004-02-10)
 
 * Added basic support for Plustek OpticSlim 2400. Thanks to Radoslaw Grzanka and
@@ -335,7 +335,7 @@ V 1.0-49 (2003-09-30)
 * Added ScanMagic 1200 UB Plus to man page and .desc.
 * Added Settings for Plustek OpticSlim 1200
 * Added detection of Genius Vivid 4x. It won't work out-of-the-box, however.
-* CCD coarse calib shouldn't run into an endless loop anymore. Plustek 1248U 
+* CCD coarse calib shouldn't run into an endless loop anymore. Plustek 1248U
   is much faster now.
 
 V 1.0-48 (2003-07-25)
@@ -376,7 +376,7 @@ V 1.0-43 (2003-03-06)
 - Small requests are done with a response buffer of 8 bytes (instead of 64)
   now. Looks like GT-6816 based scanners return 8 bytes if the firmware is
   loaded and 64 bytes if it's not loaded.
-- Changed GT-6816 firmware check to ignore errors from above change. 
+- Changed GT-6816 firmware check to ignore errors from above change.
   GT-6816 scanners work with the BSDs now (at least once).
 - Updated manpage concerning the BSDs.
 
@@ -527,8 +527,8 @@ V 1.0-27 (2002-10-25)
 - Removed override for Trust Copmact Scan and Medion/Tevion/Lifetec LT 9452
   (Mustek ScanExpress 1200 UB Plus clones).
 - Removed override for Tevion MD 9458 (seems to be an Artec Ultima 2000 (e +?)
-  clone). 
-  
+  clone).
+
 V 1.0-26 (2002-10-22)
 
 - Several fixes for Medion MD-9385 and Artec Ultima 2000 based scanners. The