diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-05-20 14:05:32 +0300 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-05-20 14:05:32 +0300 |
| commit | fe641682176a4940ad5d71366f0b74f9eabe7118 (patch) | |
| tree | 82f1a09547b4c92bfa405b51e4683595c0cc26bb /indra/newview/app_settings/shaders/class1 | |
| parent | 56e88c6b2e656a28b25154e27c05e7ced65d90a8 (diff) | |
| parent | 13d2501c847929ce9ee155dbb4dcfcf166710d3e (diff) | |
Manual merge from default branch.
Auto-resolved conflicts in:
- indra/newview/llpaneleditwearable.cpp
- indra/newview/llviewermenu.cpp
- indra/newview/llviewerwindow.cpp
- indra/newview/skins/default/xui/en/notifications.xml
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/app_settings/shaders/class1')
0 files changed, 0 insertions, 0 deletions