aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/skins/default/xui/uk
diff options
context:
space:
mode:
authorDavid Seikel2011-03-20 17:02:40 +1000
committerDavid Seikel2011-03-20 17:02:40 +1000
commit8c15fcec590c68337b8aa05d17793cd3c2a48068 (patch)
treee233ecfa79c6fe22f47dc0eba44c0300dc0daa71 /linden/indra/newview/skins/default/xui/uk
parentThe half arsed IRC support was broken. It's still not working, though it wor... (diff)
parentMerge remote-tracking branch 'jacek/exp' into exp (diff)
downloadmeta-impy-8c15fcec590c68337b8aa05d17793cd3c2a48068.zip
meta-impy-8c15fcec590c68337b8aa05d17793cd3c2a48068.tar.gz
meta-impy-8c15fcec590c68337b8aa05d17793cd3c2a48068.tar.bz2
meta-impy-8c15fcec590c68337b8aa05d17793cd3c2a48068.tar.xz
Merge remote-tracking branch 'mccabe/exp' into weekly
Conflicts: (Keeping these around as a record, there was some strangeness. .gitignore linden/indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp linden/indra/newview/llfloaterregioninfo.cpp linden/indra/newview/llfloatertos.cpp linden/indra/newview/llpanellogin.cpp linden/indra/newview/skins/default/html/en-us/loading-error/index.html linden/indra/newview/skins/default/html/en-us/loading/loading.html linden/indra/newview/skins/default/xui/en-us/floater_about.xml linden/install.xml
Diffstat (limited to 'linden/indra/newview/skins/default/xui/uk')
0 files changed, 0 insertions, 0 deletions