From f5c9cf4c7322446d52610e0dc7dfed18d740f06b Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Sat, 27 Feb 2010 14:11:34 -0600 Subject: Bumped version to 1.3.0 beta 1. --- ChangeLog.txt | 13 +++++++++++++ linden/indra/llcommon/llversionviewer.h | 2 +- linden/indra/newview/English.lproj/InfoPlist.strings | 4 ++-- linden/indra/newview/Info-Imprudence.plist | 2 +- linden/indra/newview/res/viewerRes.rc | 4 ++-- 5 files changed, 19 insertions(+), 6 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index 231aff9..a9044a4 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,5 +1,18 @@ +=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- +=- 1.3.0 BETA 1 -= +=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- + + 2010-02-27 Jacek Antonelli + * Bumped version to 1.3.0 beta 1. + + modified: linden/indra/llcommon/llversionviewer.h + modified: linden/indra/newview/English.lproj/InfoPlist.strings + modified: linden/indra/newview/Info-Imprudence.plist + modified: linden/indra/newview/res/viewerRes.rc + + * Fixed Import/Export/Make Outfit button positions (#215). modified: linden/indra/newview/skins/default/xui/en-us/floater_customize.xml diff --git a/linden/indra/llcommon/llversionviewer.h b/linden/indra/llcommon/llversionviewer.h index b7f18f8..a096102 100644 --- a/linden/indra/llcommon/llversionviewer.h +++ b/linden/indra/llcommon/llversionviewer.h @@ -46,6 +46,6 @@ const char * const IMP_VIEWER_NAME = "Imprudence"; const S32 IMP_VERSION_MAJOR = 1; const S32 IMP_VERSION_MINOR = 3; const S32 IMP_VERSION_PATCH = 0; -const char * const IMP_VERSION_TEST = "merge test"; +const char * const IMP_VERSION_TEST = "beta 1"; #endif diff --git a/linden/indra/newview/English.lproj/InfoPlist.strings b/linden/indra/newview/English.lproj/InfoPlist.strings index d32878c..a5bb0ba 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.3.0"; -CFBundleGetInfoString = "Imprudence version 1.3.0"; +CFBundleShortVersionString = "Imprudence version 1.3.0 beta 1"; +CFBundleGetInfoString = "Imprudence version 1.3.0 beta 1"; diff --git a/linden/indra/newview/Info-Imprudence.plist b/linden/indra/newview/Info-Imprudence.plist index 098dda6..5ae2320 100644 --- a/linden/indra/newview/Info-Imprudence.plist +++ b/linden/indra/newview/Info-Imprudence.plist @@ -32,7 +32,7 @@ CFBundleVersion - 1.3.0 + 1.3.0 beta 1 CSResourcesFileMapped diff --git a/linden/indra/newview/res/viewerRes.rc b/linden/indra/newview/res/viewerRes.rc index 18d8d55..f6eee82 100644 --- a/linden/indra/newview/res/viewerRes.rc +++ b/linden/indra/newview/res/viewerRes.rc @@ -156,11 +156,11 @@ BEGIN BEGIN VALUE "CompanyName", "Imprudence Viewer Project" VALUE "FileDescription", "Imprudence" - VALUE "FileVersion", "1.3.0" + VALUE "FileVersion", "1.3.0 beta 1" VALUE "InternalName", "Imprudence" VALUE "OriginalFilename", "Imprudence.exe" VALUE "ProductName", "Imprudence" - VALUE "ProductVersion", "1.3.0" + VALUE "ProductVersion", "1.3.0 beta 1" END END BLOCK "VarFileInfo" -- cgit v1.1