diff options
| author | Richard Linden <none@none> | 2011-06-29 13:13:32 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-06-29 13:13:32 -0700 |
| commit | d3922f8e494e0858c8f346128f9d2c5e0377c1b8 (patch) | |
| tree | 0d95ade82defe94ddb1f58f376117944a27acd95 | |
| parent | c998f21c5201a4c117ad601fbd23c116fd9faa04 (diff) | |
| parent | 8a4b3e33cdd6f196f25e4acf86e80de08907590e (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience
| -rw-r--r-- | doc/contributions.txt | 1 | ||||
| -rw-r--r-- | indra/newview/app_settings/keys.xml | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index b744f4db3e..8d7e7a4a60 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -158,6 +158,7 @@ Ann Congrejo CT-193 Ansariel Hiller STORM-1101 + VWR-26150 Ardy Lay STORM-859 VWR-19499 diff --git a/indra/newview/app_settings/keys.xml b/indra/newview/app_settings/keys.xml index d085475c6c..101deea55b 100644 --- a/indra/newview/app_settings/keys.xml +++ b/indra/newview/app_settings/keys.xml @@ -181,7 +181,7 @@ <binding key="PAD_DIVIDE" mask="CTL_ALT_SHIFT" command="start_gesture"/> </third_person> - # Basic editing camera control + <-- Basic editing camera control --> <edit> <binding key="A" mask="NONE" command="spin_around_cw"/> <binding key="D" mask="NONE" command="spin_around_ccw"/> |