[SCM] Multi-format 1D/2D barcode image processing library branch, upstream, updated. 24d4480bc48cf9eabf7b2bd2f528248b0e458809

[dswitkin]

The following commit has been merged in the upstream branch:
commit 7c42e0be7330894b22186553069727cd7099e952
Author: dswitkin <dswitkin at 59b500cc-1b3d-0410-9834-0bbf25fbcc57>
Date:   Fri May 28 15:30:48 2010 +0000

    Created Barcode Scanner 3.31 final.
    
    git-svn-id: http://zxing.googlecode.com/svn/trunk@1394 59b500cc-1b3d-0410-9834-0bbf25fbcc57

diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index f84f083..501a15a 100755
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -20,8 +20,8 @@ version to be published. The next versionCode will be 7, regardless of whether t
 versionName is 2.31, 2.4, or 3.0. -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.google.zxing.client.android"
-          android:versionName="3.31 beta 1"
-          android:versionCode="52">
+          android:versionName="3.31"
+          android:versionCode="53">
   <!-- We require Cupcake (Android 1.5) or later, but are really targeting Donut. -->
   <uses-sdk android:minSdkVersion="3"
             android:targetSdkVersion="4"/>
diff --git a/android/assets/html/whatsnew.html b/android/assets/html/whatsnew.html
index 0356d1c..994b1f2 100644
--- a/android/assets/html/whatsnew.html
+++ b/android/assets/html/whatsnew.html
@@ -9,7 +9,7 @@
   <li>Improved scanning speed.</li>
   <li>Added RSS Expanded support.</li>
   <li>Fixed a crash in the QR Code reader.</li>
-  <li>Improved Chinese characeter support in QR Codes.</li>
+  <li>Improved Chinese character support in QR Codes.</li>
 </ul>
 <p><b>New in version 3.3:</b></p>
 <ul>

-- 
Multi-format 1D/2D barcode image processing library