Merge branch '1.2-maint' into next

Conflicts:
	linden/indra/newview/res/viewerRes.rc

3 files changed, 4 insertions, 3 deletions

diff --git a/linden/indra/newview/English.lproj/InfoPlist.strings b/linden/indra/newview/English.lproj/InfoPlist.strings
index 2657d6f..3b90609 100644
--- a/linden/indra/newview/English.lproj/InfoPlist.strings
+++ b/linden/indra/newview/English.lproj/InfoPlist.strings
@@ -1,5 +1,5 @@
 /* Localized versions of Info.plist keys */
 
 CFBundleName = "Imprudence";
-CFBundleShortVersionString = "Imprudence version 1.2.0";
-CFBundleGetInfoString = "Imprudence version 1.2.0";
+CFBundleShortVersionString = "Imprudence version 1.2.1";
+CFBundleGetInfoString = "Imprudence version 1.2.1";
diff --git a/linden/indra/newview/Info-Imprudence.plist b/linden/indra/newview/Info-Imprudence.plist
index 42164c6..affdb57 100644
--- a/linden/indra/newview/Info-Imprudence.plist
+++ b/linden/indra/newview/Info-Imprudence.plist
@@ -32,7 +32,7 @@
                 </dict>
         </array>
         <key>CFBundleVersion</key>
-        <string>1.2.0</string>
+        <string>1.2.1</string>
         <key>CSResourcesFileMapped</key>
         <true/>
 </dict>
diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py
index 32b553b..39df657 100755
--- a/linden/indra/newview/viewer_manifest.py
+++ b/linden/indra/newview/viewer_manifest.py
@@ -824,6 +824,7 @@ class Linux_i686Manifest(LinuxManifest):
             self.path("libSDL-1.2.so.0")
             self.path("libELFIO.so")
             self.path("libopenjpeg.so.1.3.0", "libopenjpeg.so.1.3")
+            self.path("libxml2.so.2")
             self.path("libz.so.1")
 
             # OpenAL