From 181bf2ba8efa49d3a2456cf5cc68537e39d387dd Mon Sep 17 00:00:00 2001 From: Christian Goetze Date: Thu, 30 Jul 2009 01:19:13 +0000 Subject: Bump trunk version to 1.31 --- indra/newview/res/viewerRes.rc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'indra/newview/res/viewerRes.rc') diff --git a/indra/newview/res/viewerRes.rc b/indra/newview/res/viewerRes.rc index a902a6dff0..352d5cab55 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,24,0,0 - PRODUCTVERSION 1,24,0,0 + FILEVERSION 1,24,4,0 + PRODUCTVERSION 1,24,4,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -156,12 +156,12 @@ BEGIN BEGIN VALUE "CompanyName", "Linden Lab" VALUE "FileDescription", "Second Life" - VALUE "FileVersion", "1.24.0.0" + VALUE "FileVersion", "1.24.4.0" VALUE "InternalName", "Second Life" VALUE "LegalCopyright", "Copyright © 2001-2008, Linden Research, Inc." VALUE "OriginalFilename", "SecondLife.exe" VALUE "ProductName", "Second Life" - VALUE "ProductVersion", "1.24.0.0" + VALUE "ProductVersion", "1.24.4.0" END END BLOCK "VarFileInfo" -- cgit v1.2.3 From 89de8e5b552b997335a429ad41f86e4200441b11 Mon Sep 17 00:00:00 2001 From: CG Linden Date: Mon, 31 Aug 2009 13:26:35 -0700 Subject: Port over the new build scripts from para-test, tweek update_version_files to use the repo revision number for now. --- indra/newview/res/viewerRes.rc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'indra/newview/res/viewerRes.rc') diff --git a/indra/newview/res/viewerRes.rc b/indra/newview/res/viewerRes.rc index 87a8bd5787..a5ee78df2c 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 2,0,0,0 - PRODUCTVERSION 2,0,0,0 + FILEVERSION 2,0,0,2425 + PRODUCTVERSION 2,0,0,2425 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -156,12 +156,12 @@ BEGIN BEGIN VALUE "CompanyName", "Linden Lab" VALUE "FileDescription", "Second Life" - VALUE "FileVersion", "2.0.0.0" + VALUE "FileVersion", "2.0.0.2425" VALUE "InternalName", "Second Life" VALUE "LegalCopyright", "Copyright © 2001-2008, Linden Research, Inc." VALUE "OriginalFilename", "SecondLife.exe" VALUE "ProductName", "Second Life" - VALUE "ProductVersion", "2.0.0.0" + VALUE "ProductVersion", "2.0.0.2425" END END BLOCK "VarFileInfo" -- cgit v1.2.3 From 9a8042d5a3edfd07727793a1939c3ab361ceec9a Mon Sep 17 00:00:00 2001 From: CG Linden Date: Sun, 13 Sep 2009 15:32:28 -0700 Subject: Adapt the build script so it can be invoked from a developer checkout. --- indra/newview/res/viewerRes.rc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'indra/newview/res/viewerRes.rc') diff --git a/indra/newview/res/viewerRes.rc b/indra/newview/res/viewerRes.rc index d64fc7c8da..bdf7631770 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 2,0,0,2425 - PRODUCTVERSION 2,0,0,2425 + FILEVERSION 2,0,0,2639 + PRODUCTVERSION 2,0,0,2639 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -156,12 +156,12 @@ BEGIN BEGIN VALUE "CompanyName", "Linden Lab" VALUE "FileDescription", "Second Life" - VALUE "FileVersion", "2.0.0.2425" + VALUE "FileVersion", "2.0.0.2639" VALUE "InternalName", "Second Life" VALUE "LegalCopyright", "Copyright � 2001-2008, Linden Research, Inc." VALUE "OriginalFilename", "SecondLife.exe" VALUE "ProductName", "Second Life" - VALUE "ProductVersion", "2.0.0.2425" + VALUE "ProductVersion", "2.0.0.2639" END END BLOCK "VarFileInfo" -- cgit v1.2.3 From 422b9c5872f15b3d0a6e40472a8e528d7d94df5f Mon Sep 17 00:00:00 2001 From: CG Linden Date: Wed, 16 Sep 2009 21:50:40 -0700 Subject: Relocate build.sh to the top of the source tree. --- indra/newview/res/viewerRes.rc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'indra/newview/res/viewerRes.rc') diff --git a/indra/newview/res/viewerRes.rc b/indra/newview/res/viewerRes.rc index a5ee78df2c..6a32dba083 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 2,0,0,2425 - PRODUCTVERSION 2,0,0,2425 + FILEVERSION 2,0,0,2822 + PRODUCTVERSION 2,0,0,2822 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -156,12 +156,12 @@ BEGIN BEGIN VALUE "CompanyName", "Linden Lab" VALUE "FileDescription", "Second Life" - VALUE "FileVersion", "2.0.0.2425" + VALUE "FileVersion", "2.0.0.2822" VALUE "InternalName", "Second Life" VALUE "LegalCopyright", "Copyright © 2001-2008, Linden Research, Inc." VALUE "OriginalFilename", "SecondLife.exe" VALUE "ProductName", "Second Life" - VALUE "ProductVersion", "2.0.0.2425" + VALUE "ProductVersion", "2.0.0.2822" END END BLOCK "VarFileInfo" -- cgit v1.2.3 From 050ae3cf5107140a58f6aeae865d254b74a23d44 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Thu, 15 Oct 2009 15:43:59 -0400 Subject: Merge up to latest viewer/viewer-2-0 --- indra/newview/res/viewerRes.rc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'indra/newview/res/viewerRes.rc') diff --git a/indra/newview/res/viewerRes.rc b/indra/newview/res/viewerRes.rc index 63b76d4f5d..433070ce34 100644 --- a/indra/newview/res/viewerRes.rc +++ b/indra/newview/res/viewerRes.rc @@ -134,8 +134,8 @@ TOOLMEDIAOPEN CURSOR "toolmediaopen.cur" // VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,0,0,2822 - PRODUCTVERSION 2,0,0,2822 + FILEVERSION 2,0,0,3256 + PRODUCTVERSION 2,0,0,3256 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -152,12 +152,12 @@ BEGIN BEGIN VALUE "CompanyName", "Linden Lab" VALUE "FileDescription", "Second Life" - VALUE "FileVersion", "2.0.0.2822" + VALUE "FileVersion", "2.0.0.3256" VALUE "InternalName", "Second Life" VALUE "LegalCopyright", "Copyright © 2001-2008, Linden Research, Inc." VALUE "OriginalFilename", "SecondLife.exe" VALUE "ProductName", "Second Life" - VALUE "ProductVersion", "2.0.0.2822" + VALUE "ProductVersion", "2.0.0.3256" END END BLOCK "VarFileInfo" -- cgit v1.2.3