diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-03-29 18:41:08 +0300 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-03-29 18:41:08 +0300 |
| commit | 6e0770908dc151b09a2863b95dc0c132d242acc0 (patch) | |
| tree | c72c7070cc0438dc4165ef8d5c6b329fc16448b5 /indra/newview/skins/default/xui/de/panel_region_general_layout.xml | |
| parent | f55af5fcdfdd0b4520e382d315afefd41c534820 (diff) | |
| parent | 61657d2e7904ba7274a0ab5d451669d2ee7bb7cc (diff) | |
Manual merge from default branch
Resolved conflicts in indra/newview/llchathistory.cpp in favor of trunk version.
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/skins/default/xui/de/panel_region_general_layout.xml')
0 files changed, 0 insertions, 0 deletions