Merge branch 'feature/upstream' into develop

1 files changed, 14 insertions, 14 deletions

diff --git a/doc/mustek_usb/mustek_usb.CHANGES b/doc/mustek_usb/mustek_usb.CHANGES
index 7b01c4a..b31f248 100644
--- a/doc/mustek_usb/mustek_usb.CHANGES
+++ b/doc/mustek_usb/mustek_usb.CHANGES
@@ -17,7 +17,7 @@ CHANGES for the SANE Mustek USB backend
   * Fixed check for single quotation marks.
 
 2003-02-22:
-  * Release of version 1.0-16. 
+  * Release of version 1.0-16.
 
 2003-02-22:
   * Iniatialize global variables explicitely.
@@ -34,7 +34,7 @@ CHANGES for the SANE Mustek USB backend
     to other backends for Mustek scanners.
 
 2002-07-17:
-  * Release of version 1.0-15. 
+  * Release of version 1.0-15.
 
 2002-07-17:
   * Added manufacturer comment in mustek_usb.desc.
@@ -43,7 +43,7 @@ CHANGES for the SANE Mustek USB backend
   * Really check the status in usb_low_open.
 
 2002-04-24:
-  * Release of version 1.0-14. 
+  * Release of version 1.0-14.
 
 2002-04-24:
   * Undef MIN and MAX if they are defined in mustek_usb_low.h to avoid
@@ -53,7 +53,7 @@ CHANGES for the SANE Mustek USB backend
   * Free devlist in sane_exit.
 
 2002-04-10:
-  * Release of version 1.0-13. 
+  * Release of version 1.0-13.
 
 2002-04-10:
   * sane_set_io_mode must return SANE_STAUS_GOOD if non_blocking is false.
@@ -63,7 +63,7 @@ CHANGES for the SANE Mustek USB backend
   * sane_exit: set freed variable to 0.
 
 2002-03-20:
-  * Release of version 1.0-12. 
+  * Release of version 1.0-12.
 
 2002-03-19:
   * Option 0 has an empty name now.
@@ -73,7 +73,7 @@ CHANGES for the SANE Mustek USB backend
   * Added more debug output in sane_control_option.
 
 2002-03-17:
-  * Release of version 1.0-11. 
+  * Release of version 1.0-11.
 
 2002-03-16:
   * mustek_usb.c: Fixed segfault when opening device again after closing.
@@ -90,7 +90,7 @@ CHANGES for the SANE Mustek USB backend
   * Fixed undefined operation warnings.
 
 2002-01-11
-  * Release of version 1.0-10. 
+  * Release of version 1.0-10.
 
 2002-01-11
   * mustek_usb_high.(c|h), mustek_usb_mid.(c|h): commented out unused CCD code.
@@ -106,7 +106,7 @@ CHANGES for the SANE Mustek USB backend
   * Added link to plustek to manual page.
 
 2001-12-08
-  * Release of version 1.0-9. 
+  * Release of version 1.0-9.
 
 2001-12-08
 
@@ -118,7 +118,7 @@ CHANGES for the SANE Mustek USB backend
     size of data acquired in one turn.
 
 2001-11-15
-  * Release of version 1.0-8. 
+  * Release of version 1.0-8.
 
 2001-11-15
   * Updated manual page concerning FreeBSD and kernel configuration.
@@ -140,7 +140,7 @@ CHANGES for the SANE Mustek USB backend
   * Removed load_private_profile (now in usb_high_scan_init).
 
 2001-10-07
-  * Release of version 1.0-7. 
+  * Release of version 1.0-7.
 
 2001-10-07
 
@@ -312,7 +312,7 @@ CHANGES for the SANE Mustek USB backend
   * mustek_usb_low:
     - fixed compilation warnings
     - fixed compilation problems
-    - fixed C++ to C transition issues (e.g. "initializer element is not 
+    - fixed C++ to C transition issues (e.g. "initializer element is not
       computable at load time")
     - fixed debug output
     - adjusted some names
@@ -355,7 +355,7 @@ CHANGES for the SANE Mustek USB backend
 
 2001-07-22
   * mustek_usb_low: Only one data structure: ma1017.
-  * mustek_usb_mid:  
+  * mustek_usb_mid:
     - removed //
     - remove SANE disclaimers
     - use SANE types
@@ -404,7 +404,7 @@ CHANGES for the SANE Mustek USB backend
   * Used "../include/sane" in #include statements
   * Used /dev/usbscanner in mustek_usb.conf
   * Fixed mustek_usb.desc
-  * Fixed mustek_usb.*: 
+  * Fixed mustek_usb.*:
     - use correct names
     - no leading "_"
     - use only C-style comments
@@ -418,4 +418,4 @@ CHANGES for the SANE Mustek USB backend
     - commented out all references to c_scanner
     - removed references to WORD and other non-standard types
     - moved read_rows from global to Mustek_Usb_Scanner
-    --> mustek_usb.* compiles
\ No newline at end of file
+    --> mustek_usb.* compiles