diff options
author | Debi King (Dessie) <dessie@lindenlab.com> | 2011-04-12 18:24:05 -0400 |
---|---|---|
committer | Debi King (Dessie) <dessie@lindenlab.com> | 2011-04-12 18:24:05 -0400 |
commit | 95fcff557f19712e23410a07751f2b571fead8a9 (patch) | |
tree | 1eef32416e5e1c9c60d478ae674b2fe9a35d0c55 /indra/newview/skins/minimal/xui/de/panel_group_control_panel.xml | |
parent | 3ffc5dc09c186fe0ac57ac66b33bfc105ca01363 (diff) | |
parent | a22e3df7e5570e52abcba4a28103c3d76960a010 (diff) |
fixed merge conflict in .hgtags
Diffstat (limited to 'indra/newview/skins/minimal/xui/de/panel_group_control_panel.xml')
-rw-r--r-- | indra/newview/skins/minimal/xui/de/panel_group_control_panel.xml | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/indra/newview/skins/minimal/xui/de/panel_group_control_panel.xml b/indra/newview/skins/minimal/xui/de/panel_group_control_panel.xml new file mode 100644 index 0000000000..81e6040f84 --- /dev/null +++ b/indra/newview/skins/minimal/xui/de/panel_group_control_panel.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="panel_im_control_panel"> + <layout_stack name="vertical_stack"> + <layout_panel name="end_call_btn_panel"> + <button label="Anruf beenden" name="end_call_btn"/> + </layout_panel> + <layout_panel name="voice_ctrls_btn_panel"> + <button label="Voice-Steuerung öffnen" name="voice_ctrls_btn"/> + </layout_panel> + </layout_stack> +</panel> |