aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMcCabe Maxsted2009-10-09 09:17:19 -0700
committerMcCabe Maxsted2009-10-09 09:17:19 -0700
commitbbbd923e7a825101a2db2ad6c9757db96a501260 (patch)
treea8a21471e2f5430a129b853c3576b334fe01afe8
parentMerge commit 'jacek/next' into next (diff)
downloadmeta-impy-Imprudence-1.2.0-beta2.zip
meta-impy-Imprudence-1.2.0-beta2.tar.gz
meta-impy-Imprudence-1.2.0-beta2.tar.bz2
meta-impy-Imprudence-1.2.0-beta2.tar.xz
Updated version info to 1.2.0 beta 2, added changelog bannerImprudence-1.2.0-beta2
-rw-r--r--ChangeLog.txt12
-rw-r--r--linden/indra/llcommon/llversionviewer.h2
-rw-r--r--linden/indra/newview/English.lproj/InfoPlist.strings4
-rw-r--r--linden/indra/newview/Info-Imprudence.plist2
-rw-r--r--linden/indra/newview/res/viewerRes.rc8
5 files changed, 20 insertions, 8 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt
index b3e4679..0fe80e5 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,5 +1,17 @@
1=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
2=- 1.2.0 BETA 2 -=
3=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
4
12009-10-09 McCabe Maxsted <hakushakukun@gmail.com> 52009-10-09 McCabe Maxsted <hakushakukun@gmail.com>
2 6
7 * Updated version info to 1.2.0 beta 2, added changelog banner.
8
9 modified: linden/indra/llcommon/llversionviewer.h
10 modified: linden/indra/newview/English.lproj/InfoPlist.strings
11 modified: linden/indra/newview/Info-Imprudence.plist
12 modified: linden/indra/newview/res/viewerRes.rc
13
14
3 * Fixed new search window size hiding next/prev buttons. 15 * Fixed new search window size hiding next/prev buttons.
4 16
5 modified: linden/indra/newview/skins/default/xui/en-us/floater_directory.xml 17 modified: linden/indra/newview/skins/default/xui/en-us/floater_directory.xml
diff --git a/linden/indra/llcommon/llversionviewer.h b/linden/indra/llcommon/llversionviewer.h
index b8f7ae8..30d8530 100644
--- a/linden/indra/llcommon/llversionviewer.h
+++ b/linden/indra/llcommon/llversionviewer.h
@@ -45,6 +45,6 @@ const char * const IMP_VIEWER_NAME = "Imprudence";
45const S32 IMP_VERSION_MAJOR = 1; 45const S32 IMP_VERSION_MAJOR = 1;
46const S32 IMP_VERSION_MINOR = 2; 46const S32 IMP_VERSION_MINOR = 2;
47const S32 IMP_VERSION_PATCH = 0; 47const S32 IMP_VERSION_PATCH = 0;
48const char * const IMP_VERSION_TEST = "beta"; 48const char * const IMP_VERSION_TEST = "beta 2";
49 49
50#endif 50#endif
diff --git a/linden/indra/newview/English.lproj/InfoPlist.strings b/linden/indra/newview/English.lproj/InfoPlist.strings
index 074005b..14a0102 100644
--- a/linden/indra/newview/English.lproj/InfoPlist.strings
+++ b/linden/indra/newview/English.lproj/InfoPlist.strings
@@ -1,5 +1,5 @@
1/* Localized versions of Info.plist keys */ 1/* Localized versions of Info.plist keys */
2 2
3CFBundleName = "Imprudence"; 3CFBundleName = "Imprudence";
4CFBundleShortVersionString = "Imprudence version 1.2.0 beta"; 4CFBundleShortVersionString = "Imprudence version 1.2.0 beta 2";
5CFBundleGetInfoString = "Imprudence version 1.2.0 beta"; 5CFBundleGetInfoString = "Imprudence version 1.2.0 beta 2";
diff --git a/linden/indra/newview/Info-Imprudence.plist b/linden/indra/newview/Info-Imprudence.plist
index 750afd7..e44dcbe 100644
--- a/linden/indra/newview/Info-Imprudence.plist
+++ b/linden/indra/newview/Info-Imprudence.plist
@@ -32,7 +32,7 @@
32 </dict> 32 </dict>
33 </array> 33 </array>
34 <key>CFBundleVersion</key> 34 <key>CFBundleVersion</key>
35 <string>1.2.0 beta</string> 35 <string>1.2.0 beta 2</string>
36 <key>CSResourcesFileMapped</key> 36 <key>CSResourcesFileMapped</key>
37 <true/> 37 <true/>
38</dict> 38</dict>
diff --git a/linden/indra/newview/res/viewerRes.rc b/linden/indra/newview/res/viewerRes.rc
index e9307d4..7577685 100644
--- a/linden/indra/newview/res/viewerRes.rc
+++ b/linden/indra/newview/res/viewerRes.rc
@@ -231,8 +231,8 @@ TOOLMEDIAOPEN CURSOR "toolmediaopen.cur"
231// 231//
232 232
233VS_VERSION_INFO VERSIONINFO 233VS_VERSION_INFO VERSIONINFO
234 FILEVERSION 1,20,15,97417 234 FILEVERSION 1,2,0
235 PRODUCTVERSION 1,20,15,97417 235 PRODUCTVERSION 1,2,0
236 FILEFLAGSMASK 0x3fL 236 FILEFLAGSMASK 0x3fL
237#ifdef _DEBUG 237#ifdef _DEBUG
238 FILEFLAGS 0x1L 238 FILEFLAGS 0x1L
@@ -249,11 +249,11 @@ BEGIN
249 BEGIN 249 BEGIN
250 VALUE "CompanyName", "Imprudence Viewer Project" 250 VALUE "CompanyName", "Imprudence Viewer Project"
251 VALUE "FileDescription", "Imprudence" 251 VALUE "FileDescription", "Imprudence"
252 VALUE "FileVersion", "1.2.0 beta" 252 VALUE "FileVersion", "1.2.0 beta 2"
253 VALUE "InternalName", "Imprudence" 253 VALUE "InternalName", "Imprudence"
254 VALUE "OriginalFilename", "Imprudence.exe" 254 VALUE "OriginalFilename", "Imprudence.exe"
255 VALUE "ProductName", "Imprudence" 255 VALUE "ProductName", "Imprudence"
256 VALUE "ProductVersion", "1.2.0 beta" 256 VALUE "ProductVersion", "1.2.0 beta 2"
257 END 257 END
258 END 258 END
259 BLOCK "VarFileInfo" 259 BLOCK "VarFileInfo"