diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-05-19 13:43:12 +0300 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-05-19 13:43:12 +0300 |
| commit | 2c817f0b40aa22209b498e5e42dca8eab6439f4e (patch) | |
| tree | d86f5574202c7415c93fc45c7a5cd1f7fe892d06 /indra/newview/llfloatertos.h | |
| parent | a4fc76a0f749e07d703ddb7ed923d7c4ea94ab7e (diff) | |
| parent | 8e474b095a9d228d62101540433937abdf623842 (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/llfloatertos.h')
0 files changed, 0 insertions, 0 deletions