diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-03-16 18:55:37 +0200 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-03-16 18:55:37 +0200 |
| commit | 9677026a038b8c99cd20b7ca4f4ac2dc5bf6bb05 (patch) | |
| tree | 94d69e820a5c128ffe141234c28b096967d029c0 /indra/newview/llcallfloater.cpp | |
| parent | ba52dc2fd1d4f7c2947fd7b8bdb2adb617d9376e (diff) | |
| parent | ba414d500ca8cb88da530c89ba373c95195ce633 (diff) | |
Manual merge from default branch.
Resolved conflicts in:
* merging indra/newview/llpanelpick.cpp
* merging indra/newview/llviewermessage.cpp
* merging indra/newview/skins/default/xui/en/strings.xml
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llcallfloater.cpp')
0 files changed, 0 insertions, 0 deletions