From d63d55c60d7bbc296d06d0524f536ac2cf7a760d Mon Sep 17 00:00:00 2001 From: deed Date: Fri, 24 Mar 2017 15:10:35 +0100 Subject: [PATCH] correction du merge --- .../gamedev/interfaces_v3/interaction.xml | 5 - .../data/gamedev/interfaces_v3/login_main.xml | 1826 ++++++++--------- .../gamedev/interfaces_v3/login_widgets.xml | 73 +- .../gamedev/interfaces_v3/out_v2_appear.xml | 985 ++++----- .../gamedev/interfaces_v3/out_v2_connect.xml | 168 +- .../gamedev/interfaces_v3/out_v2_crash.xml | 64 +- .../gamedev/interfaces_v3/outgame_connect.xml | 326 +-- .../gamedev/interfaces_v3/outgame_crash.xml | 236 +-- .../data/gamedev/interfaces_v3/player.lua | 5 +- 9 files changed, 1759 insertions(+), 1929 deletions(-) diff --git a/code/ryzom/client/data/gamedev/interfaces_v3/interaction.xml b/code/ryzom/client/data/gamedev/interfaces_v3/interaction.xml index fecfe5905..160c924af 100644 --- a/code/ryzom/client/data/gamedev/interfaces_v3/interaction.xml +++ b/code/ryzom/client/data/gamedev/interfaces_v3/interaction.xml @@ -1961,11 +1961,6 @@ name="6" usergroup_l="chat_menu_button" usergroup_params_l="chat_db=DYNAMIC_CHAT6" /> - - usergroup_params_l="chat_db=DYNAMIC_CHAT6" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -