diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-11-08 10:25:27 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-11-08 10:25:27 -0500 |
| commit | 9b9829a97e781129cd2a8de47cbd9e71ee590fc6 (patch) | |
| tree | 52c7f5f3d306f6603222286183b2ce4e7b952147 /indra/newview/app_settings | |
| parent | 8f47f2222c207938c8fc55158a6fff64ccf1e781 (diff) | |
| parent | 35aa37ceedaa1cadc5fd01639ecf0fafa2214b6f (diff) | |
merge changes for vmrg-178
Diffstat (limited to 'indra/newview/app_settings')
| -rwxr-xr-x[-rw-r--r--] | indra/newview/app_settings/settings.xml | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 5c0ea2f774..5c0ea2f774 100644..100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml |