aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJacek Antonelli2010-02-27 14:11:34 -0600
committerJacek Antonelli2010-02-27 14:14:40 -0600
commitf5c9cf4c7322446d52610e0dc7dfed18d740f06b (patch)
treed4811e43f2f2ee121de5938fe1e2b5dd13544805
parentFixed Import/Export/Make Outfit button positions (#215). (diff)
downloadmeta-impy-f5c9cf4c7322446d52610e0dc7dfed18d740f06b.zip
meta-impy-f5c9cf4c7322446d52610e0dc7dfed18d740f06b.tar.gz
meta-impy-f5c9cf4c7322446d52610e0dc7dfed18d740f06b.tar.bz2
meta-impy-f5c9cf4c7322446d52610e0dc7dfed18d740f06b.tar.xz
Bumped version to 1.3.0 beta 1.
-rw-r--r--ChangeLog.txt13
-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.rc4
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=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
2=- 1.3.0 BETA 1 -=
3=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
4
5
12010-02-27 Jacek Antonelli <jacek.antonelli@gmail.com> 62010-02-27 Jacek Antonelli <jacek.antonelli@gmail.com>
2 7
8 * Bumped version to 1.3.0 beta 1.
9
10 modified: linden/indra/llcommon/llversionviewer.h
11 modified: linden/indra/newview/English.lproj/InfoPlist.strings
12 modified: linden/indra/newview/Info-Imprudence.plist
13 modified: linden/indra/newview/res/viewerRes.rc
14
15
3 * Fixed Import/Export/Make Outfit button positions (#215). 16 * Fixed Import/Export/Make Outfit button positions (#215).
4 17
5 modified: linden/indra/newview/skins/default/xui/en-us/floater_customize.xml 18 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";
46const S32 IMP_VERSION_MAJOR = 1; 46const S32 IMP_VERSION_MAJOR = 1;
47const S32 IMP_VERSION_MINOR = 3; 47const S32 IMP_VERSION_MINOR = 3;
48const S32 IMP_VERSION_PATCH = 0; 48const S32 IMP_VERSION_PATCH = 0;
49const char * const IMP_VERSION_TEST = "merge test"; 49const char * const IMP_VERSION_TEST = "beta 1";
50 50
51#endif 51#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 @@
1/* Localized versions of Info.plist keys */ 1/* Localized versions of Info.plist keys */
2 2
3CFBundleName = "Imprudence"; 3CFBundleName = "Imprudence";
4CFBundleShortVersionString = "Imprudence version 1.3.0"; 4CFBundleShortVersionString = "Imprudence version 1.3.0 beta 1";
5CFBundleGetInfoString = "Imprudence version 1.3.0"; 5CFBundleGetInfoString = "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 @@
32 </dict> 32 </dict>
33 </array> 33 </array>
34 <key>CFBundleVersion</key> 34 <key>CFBundleVersion</key>
35 <string>1.3.0</string> 35 <string>1.3.0 beta 1</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 18d8d55..f6eee82 100644
--- a/linden/indra/newview/res/viewerRes.rc
+++ b/linden/indra/newview/res/viewerRes.rc
@@ -156,11 +156,11 @@ BEGIN
156 BEGIN 156 BEGIN
157 VALUE "CompanyName", "Imprudence Viewer Project" 157 VALUE "CompanyName", "Imprudence Viewer Project"
158 VALUE "FileDescription", "Imprudence" 158 VALUE "FileDescription", "Imprudence"
159 VALUE "FileVersion", "1.3.0" 159 VALUE "FileVersion", "1.3.0 beta 1"
160 VALUE "InternalName", "Imprudence" 160 VALUE "InternalName", "Imprudence"
161 VALUE "OriginalFilename", "Imprudence.exe" 161 VALUE "OriginalFilename", "Imprudence.exe"
162 VALUE "ProductName", "Imprudence" 162 VALUE "ProductName", "Imprudence"
163 VALUE "ProductVersion", "1.3.0" 163 VALUE "ProductVersion", "1.3.0 beta 1"
164 END 164 END
165 END 165 END
166 BLOCK "VarFileInfo" 166 BLOCK "VarFileInfo"