4 files changed, 16 insertions, 6 deletions

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 8e0c8a1..a86a271 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,3 +1,13 @@
+2010-01-02  Jacek Antonelli  <jacek.antonelli@gmail.com>
+
+        * Updated version to 1.3.0 "merge test".
+          (newview/res/viewerRes.rc is already at 1.3.0.)
+
+          modified:   linden/indra/llcommon/llversionviewer.h
+          modified:   linden/indra/newview/English.lproj/InfoPlist.strings
+          modified:   linden/indra/newview/Info-Imprudence.plist
+
+
 2010-01-01 McCabe Maxsted  <hakushakukun@gmail.com>
 
         * Fixed panel_radar.xml missing from newview\CMakeLists.txt.
diff --git a/linden/indra/llcommon/llversionviewer.h b/linden/indra/llcommon/llversionviewer.h
index 6f4fffc..b7f18f8 100644
--- a/linden/indra/llcommon/llversionviewer.h
+++ b/linden/indra/llcommon/llversionviewer.h
@@ -44,8 +44,8 @@ const char * const LL_VIEWER_NAME = "Second Life";
 const char * const IMP_VIEWER_NAME = "Imprudence";
 
 const S32 IMP_VERSION_MAJOR = 1;
-const S32 IMP_VERSION_MINOR = 2;
-const S32 IMP_VERSION_PATCH = 1;
-const char * const IMP_VERSION_TEST = "";
+const S32 IMP_VERSION_MINOR = 3;
+const S32 IMP_VERSION_PATCH = 0;
+const char * const IMP_VERSION_TEST = "merge test";
 
 #endif
diff --git a/linden/indra/newview/English.lproj/InfoPlist.strings b/linden/indra/newview/English.lproj/InfoPlist.strings
index 3b90609..d32878c 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.1";
-CFBundleGetInfoString = "Imprudence version 1.2.1";
+CFBundleShortVersionString = "Imprudence version 1.3.0";
+CFBundleGetInfoString = "Imprudence version 1.3.0";
diff --git a/linden/indra/newview/Info-Imprudence.plist b/linden/indra/newview/Info-Imprudence.plist
index affdb57..098dda6 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.1</string>
+        <string>1.3.0</string>
         <key>CSResourcesFileMapped</key>
         <true/>
 </dict>