diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-04-30 08:57:29 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-04-30 08:57:29 -0400 |
| commit | 889d02b52d9d53b59e1bab953b8e19a60c49fd4f (patch) | |
| tree | 7991f8b9b0972027cc2bc7301a99779e9850141f /indra/newview/res | |
| parent | ca7de31a6c5031bb928d283362e96bb63e37ce85 (diff) | |
| parent | 2ef8fc41e74b6949e02a7715b2b8399094ebd3ea (diff) | |
merge changes for CHOP-913
Diffstat (limited to 'indra/newview/res')
| -rwxr-xr-x | indra/newview/res/viewerRes.rc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/newview/res/viewerRes.rc b/indra/newview/res/viewerRes.rc index 471a896019..8587243791 100755 --- a/indra/newview/res/viewerRes.rc +++ b/indra/newview/res/viewerRes.rc @@ -135,8 +135,8 @@ TOOLNO CURSOR "llno.cur" // VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,4,1,264760 - PRODUCTVERSION 3,4,1,264760 + FILEVERSION ${VIEWER_VERSION_MAJOR},${VIEWER_VERSION_MINOR},${VIEWER_VERSION_PATCH},${VIEWER_VERSION_REVISION} + PRODUCTVERSION ${VIEWER_VERSION_MAJOR},${VIEWER_VERSION_MINOR},${VIEWER_VERSION_PATCH},${VIEWER_VERSION_REVISION} FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -153,12 +153,12 @@ BEGIN BEGIN VALUE "CompanyName", "Linden Lab" VALUE "FileDescription", "Second Life" - VALUE "FileVersion", "3.4.1.264760" + VALUE "FileVersion", "${VIEWER_VERSION_MAJOR}.${VIEWER_VERSION_MINOR}.${VIEWER_VERSION_PATCH}.${VIEWER_VERSION_REVISION}" VALUE "InternalName", "Second Life" - VALUE "LegalCopyright", "Copyright � 2001-2010, Linden Research, Inc." + VALUE "LegalCopyright", "Copyright � 2001, Linden Research, Inc." VALUE "OriginalFilename", "SecondLife.exe" VALUE "ProductName", "Second Life" - VALUE "ProductVersion", "3.4.1.264760" + VALUE "ProductVersion", "${VIEWER_VERSION_MAJOR}.${VIEWER_VERSION_MINOR}.${VIEWER_VERSION_PATCH}.${VIEWER_VERSION_REVISION}" END END BLOCK "VarFileInfo" |