diff options
author | Bryan O'Sullivan <bos@lindenlab.com> | 2009-09-01 11:04:15 -0700 |
---|---|---|
committer | Bryan O'Sullivan <bos@lindenlab.com> | 2009-09-01 11:04:15 -0700 |
commit | 359fb947411654e7d345709448db6ff316551d96 (patch) | |
tree | 2514f1c31ce39ee63559f0c88c4b5ac6d85299b8 /indra/newview/installers/windows/lang_fr.nsi | |
parent | 3069355a6f33b7bbcfc8c493910a40e6836249e1 (diff) |
Sync up with a number of SVN changes that snuck in via weird merges
Diffstat (limited to 'indra/newview/installers/windows/lang_fr.nsi')
-rw-r--r-- | indra/newview/installers/windows/lang_fr.nsi | bin | 8118 -> 8114 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/indra/newview/installers/windows/lang_fr.nsi b/indra/newview/installers/windows/lang_fr.nsi Binary files differindex d23615de91..008c240ed7 100644 --- a/indra/newview/installers/windows/lang_fr.nsi +++ b/indra/newview/installers/windows/lang_fr.nsi |