diff options
| author | David Walter Seikel | 2013-08-30 21:42:45 +1000 |
|---|---|---|
| committer | David Walter Seikel | 2013-08-30 21:42:45 +1000 |
| commit | 56a1de48ee43bfacbd3ef2859f392082a26bc814 (patch) | |
| tree | 03bd6092dab42985e536b84d2f311a3a12e4edb4 /linden/indra/newview/skins/default/xui/es | |
| parent | Added a licensing note about gpg.vs, as used to build OTR on Windows. (diff) | |
| parent | Merge remote-tracking branch 'origin/next' into WL-refactor (diff) | |
| download | meta-impy-56a1de48ee43bfacbd3ef2859f392082a26bc814.zip meta-impy-56a1de48ee43bfacbd3ef2859f392082a26bc814.tar.gz meta-impy-56a1de48ee43bfacbd3ef2859f392082a26bc814.tar.bz2 meta-impy-56a1de48ee43bfacbd3ef2859f392082a26bc814.tar.xz | |
Merge remote-tracking branch 'imprudence/next' into next
Unless otherwise stated, Imprudence changes accepted. The three images seem to be the same.
Conflicts:
.gitignore
linden/indra/develop.py
linden/indra/llcommon/llsdserialize_xml.cpp
linden/indra/newview/CMakeLists.txt
Manually combined MOAP, OTR, and WL changes from both.
linden/indra/newview/app_settings/default_grids.xml
Manually merged the grid collection.
Also updated IG info.
linden/indra/newview/hippoupdate.cpp
linden/indra/newview/llettherebelight.cpp
Just used the Imprudence copy.
linden/indra/newview/llviewermessage.cpp
Keep unbranding.
linden/indra/newview/llvoavatar.cpp
Manually merge client tags.
linden/indra/newview/res/viewerRes.rc
Manually merge version from Impy.
linden/indra/newview/skins/dark/colors_base.xml
Keep unbranding.
linden/indra/newview/skins/default/html/unabletoconnect.png
linden/indra/newview/skins/default/textures/icon_top_pick.tga
linden/indra/newview/skins/default/xui/en-us/floater_about.xml
Manual merging of contributors.
linden/indra/newview/skins/gemini/colors_base.xml
Keep unbranding.
linden/indra/newview/skins/gemini/textures/icon_top_pick.tga
linden/indra/newview/viewer_manifest.py
Manually merged boost, gstreamer, OTR, and name.
linden/indra/newview/viewerinfo.cpp
Manually merge the comment.
Diffstat (limited to 'linden/indra/newview/skins/default/xui/es')
| -rw-r--r-- | linden/indra/newview/skins/default/xui/es/floater_html.xml | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/linden/indra/newview/skins/default/xui/es/floater_html.xml b/linden/indra/newview/skins/default/xui/es/floater_html.xml index 5977fff..8f469b1 100644 --- a/linden/indra/newview/skins/default/xui/es/floater_html.xml +++ b/linden/indra/newview/skins/default/xui/es/floater_html.xml | |||
| @@ -4,10 +4,4 @@ | |||
| 4 | <button label="Atrás" name="back_btn"/> | 4 | <button label="Atrás" name="back_btn"/> |
| 5 | <button label="Adelante" name="forward_btn"/> | 5 | <button label="Adelante" name="forward_btn"/> |
| 6 | <button label="Ir" name="go_btn"/> | 6 | <button label="Ir" name="go_btn"/> |
| 7 | <string name="home_page_url"> | ||
| 8 | http://www.secondlife.com | ||
| 9 | </string> | ||
| 10 | <string name="support_page_url"> | ||
| 11 | http://support.secondlife.com | ||
| 12 | </string> | ||
| 13 | </floater> | 7 | </floater> |