diff options
| author | Jacek Antonelli | 2008-11-01 01:32:37 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2008-11-01 01:32:37 -0500 |
| commit | 695b4cb98be4257af11d9308453d15c3f72c3986 (patch) | |
| tree | 9d9a60a0131f1d8b4a318f379ce9a9a046428b5e /linden/indra/newview/app_settings | |
| parent | Package only our free fonts. (diff) | |
| parent | Merge commit 'mccabe/rebranding' into rebranding (diff) | |
| download | meta-impy-695b4cb98be4257af11d9308453d15c3f72c3986.zip meta-impy-695b4cb98be4257af11d9308453d15c3f72c3986.tar.gz meta-impy-695b4cb98be4257af11d9308453d15c3f72c3986.tar.bz2 meta-impy-695b4cb98be4257af11d9308453d15c3f72c3986.tar.xz | |
Merge branch 'rebranding' into next
Conflicts:
linden/indra/newview/viewer_manifest.py
Diffstat (limited to 'linden/indra/newview/app_settings')
| -rw-r--r-- | linden/indra/newview/app_settings/settings.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml index 6c6f252..1d2da46 100644 --- a/linden/indra/newview/app_settings/settings.xml +++ b/linden/indra/newview/app_settings/settings.xml | |||
| @@ -9533,7 +9533,7 @@ | |||
| 9533 | <key>Type</key> | 9533 | <key>Type</key> |
| 9534 | <string>String</string> | 9534 | <string>String</string> |
| 9535 | <key>Value</key> | 9535 | <key>Value</key> |
| 9536 | <string>Second Life Release</string> | 9536 | <string>Imprudence</string> |
| 9537 | </map> | 9537 | </map> |
| 9538 | <key>VertexShaderEnable</key> | 9538 | <key>VertexShaderEnable</key> |
| 9539 | <map> | 9539 | <map> |