diff options
| author | Mark Palange <palange@lindenlab.com> | 2009-01-13 03:46:56 +0000 |
|---|---|---|
| committer | Mark Palange <palange@lindenlab.com> | 2009-01-13 03:46:56 +0000 |
| commit | 446c55538e1fb12d8a1feb541edf99c16bb29121 (patch) | |
| tree | 022ca3c10bd2e0326098719cdffb65f9465ab08f /indra/newview/installers/windows | |
| parent | 5476aca88e4b34d4d145f3a0b04fce95402c7b1f (diff) | |
svn merge -r106055-107012 svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer_1-22/
merge RC5 changes into trunk, plus add'l localization xml (all newly added) files that should have been added with RC0-RC4 merge, but weren't.
Diffstat (limited to 'indra/newview/installers/windows')
| -rw-r--r-- | indra/newview/installers/windows/lang_zh.nsi | bin | 5552 -> 5554 bytes |
| -rw-r--r-- | indra/newview/installers/windows/language_menu.nsi | bin | 1292 -> 1302 bytes |
2 files changed, 0 insertions, 0 deletions
diff --git a/indra/newview/installers/windows/lang_zh.nsi b/indra/newview/installers/windows/lang_zh.nsi Binary files differindex f4b7b5d143..d17e860df9 100644 --- a/indra/newview/installers/windows/lang_zh.nsi +++ b/indra/newview/installers/windows/lang_zh.nsi diff --git a/indra/newview/installers/windows/language_menu.nsi b/indra/newview/installers/windows/language_menu.nsi Binary files differindex 473f9e0784..988f452dea 100644 --- a/indra/newview/installers/windows/language_menu.nsi +++ b/indra/newview/installers/windows/language_menu.nsi |