summaryrefslogtreecommitdiff
path: root/indra/newview/res
diff options
context:
space:
mode:
authorRobert Knop <prospero@lindenlab.com>2009-04-09 00:20:15 +0000
committerRobert Knop <prospero@lindenlab.com>2009-04-09 00:20:15 +0000
commitfa121d8ee18978ffc25e9faeffcfa1d7c6e1592e (patch)
tree2fbe5f4a61cef96b932b198480991ea913daeca1 /indra/newview/res
parent2768539bfe2bf8f2d370fcef03ae7f15b55e0579 (diff)
svn merge -r115000:116937 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26
Merging from server-1.26 to trunk Only a few conflicts: scripts/farm_distribute : the upload rate in trunk was even more conservative than the one I switched to in 1.26, so kept the trunk version. indra/llcommon/llversionserver.h : did svn revert to keep trunk indra/newsim/lltask.cpp : svn is weird. The merge conflict was one that it's not obvious why it was there. However, Simon and I looked at it, and the solution was obvious : keep the trunk blob where the conflict was flagged. indra/lib/python : conflict was differing versions of the eventlib extern. did svn revert . to keep trunk.
Diffstat (limited to 'indra/newview/res')
-rw-r--r--indra/newview/res/viewerRes.rc8
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/res/viewerRes.rc b/indra/newview/res/viewerRes.rc
index 908c4e1da3..a902a6dff0 100644
--- a/indra/newview/res/viewerRes.rc
+++ b/indra/newview/res/viewerRes.rc
@@ -138,8 +138,8 @@ TOOLMEDIAOPEN CURSOR "toolmediaopen.cur"
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,23,0,0
- PRODUCTVERSION 1,23,0,0
+ FILEVERSION 1,24,0,0
+ PRODUCTVERSION 1,24,0,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -156,12 +156,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "Linden Lab"
VALUE "FileDescription", "Second Life"
- VALUE "FileVersion", "1.23.0.0"
+ VALUE "FileVersion", "1.24.0.0"
VALUE "InternalName", "Second Life"
VALUE "LegalCopyright", "Copyright © 2001-2008, Linden Research, Inc."
VALUE "OriginalFilename", "SecondLife.exe"
VALUE "ProductName", "Second Life"
- VALUE "ProductVersion", "1.23.0.0"
+ VALUE "ProductVersion", "1.24.0.0"
END
END
BLOCK "VarFileInfo"