Resolved conflicts in lltexteditor.cpp, llchatitemscontainerctrl.cpp, llchatmsgbox.cpp, llfloaterbuycurrency.cpp, llnearbychat.cpp, floater_buy_currency.xml, and ru/strings.xml Merging revisions 134925-135157 of svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-4 into C:\source\viewer-2.0.0-3, respecting ancestry |
||
|---|---|---|
| .. | ||
| FILES_ARE_UNICODE_UTF-16LE.txt | ||
| install_icon.BMP | ||
| install_icon.ico | ||
| installer_template.nsi | ||
| lang_de.nsi | ||
| lang_en-us.nsi | ||
| lang_es.nsi | ||
| lang_fr.nsi | ||
| lang_it.nsi | ||
| lang_ja.nsi | ||
| lang_ko.nsi | ||
| lang_nl.nsi | ||
| lang_pt-br.nsi | ||
| lang_zh.nsi | ||
| language_menu.nsi | ||
| uninstall_icon.BMP | ||
| uninstall_icon.ico | ||