summaryrefslogtreecommitdiff
path: root/indra/newview/tr.lproj
diff options
context:
space:
mode:
authorVadim Savchuk <vsavchuk@productengine.com>2010-05-19 13:43:12 +0300
committerVadim Savchuk <vsavchuk@productengine.com>2010-05-19 13:43:12 +0300
commit2c817f0b40aa22209b498e5e42dca8eab6439f4e (patch)
treed86f5574202c7415c93fc45c7a5cd1f7fe892d06 /indra/newview/tr.lproj
parenta4fc76a0f749e07d703ddb7ed923d7c4ea94ab7e (diff)
parent8e474b095a9d228d62101540433937abdf623842 (diff)
Manual merge from default branch
Resolved conflicts in: - indra/newview/skins/default/xui/en/floater_world_map.xml - indra/newview/skins/default/xui/en/notifications.xml --HG-- branch : product-engine
Diffstat (limited to 'indra/newview/tr.lproj')
0 files changed, 0 insertions, 0 deletions