diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-08-26 16:52:32 +0300 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-08-26 16:52:32 +0300 |
| commit | 19fb0a16695b57e70dc371471d37c16929f1c424 (patch) | |
| tree | 39f16d806b66e3795ded41c1462e205404996046 /indra/newview/res | |
| parent | 8e56f063924601041bac3791e794fa6934f20936 (diff) | |
| parent | 1a8d917a6d0d2393a0f0248d0072dd7cfd487609 (diff) | |
Manual merge from default branch
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/res')
| -rw-r--r-- | indra/newview/res/have_artwork_bundle.marker | 1 | ||||
| -rw-r--r-- | indra/newview/res/viewerRes.rc | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/res/have_artwork_bundle.marker b/indra/newview/res/have_artwork_bundle.marker new file mode 100644 index 0000000000..1dbb238d53 --- /dev/null +++ b/indra/newview/res/have_artwork_bundle.marker @@ -0,0 +1 @@ +If this file exists then you have the artwork bundle installed, which is packaged separately from the Viewer source in the open-source tree. This marker is for the benefit of the build system so it can warn you properly if it's not there. :) diff --git a/indra/newview/res/viewerRes.rc b/indra/newview/res/viewerRes.rc index a575aabbca..5e8cee1f5f 100644 --- a/indra/newview/res/viewerRes.rc +++ b/indra/newview/res/viewerRes.rc @@ -149,7 +149,7 @@ BEGIN VALUE "FileDescription", "Second Life" VALUE "FileVersion", "2.1.1.0" VALUE "InternalName", "Second Life" - VALUE "LegalCopyright", "Copyright © 2001-2010, Linden Research, Inc." + VALUE "LegalCopyright", "Copyright � 2001-2010, Linden Research, Inc." VALUE "OriginalFilename", "SecondLife.exe" VALUE "ProductName", "Second Life" VALUE "ProductVersion", "2.1.1.0" |