From bda7b8cc0776456e8d392be45be9b74183cf0f37 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Thu, 22 Jun 2017 20:43:46 +0300
Subject: Add chat command for move mercenary to master.

---
 src/input/inputactionmap.h | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'src/input/inputactionmap.h')

diff --git a/src/input/inputactionmap.h b/src/input/inputactionmap.h
index 0de10a4e4..cfee0245f 100644
--- a/src/input/inputactionmap.h
+++ b/src/input/inputactionmap.h
@@ -5696,6 +5696,12 @@ static const InputActionData inputActionData
         "serverinfo|infoserver",
         UseArgs_false,
         Protected_false},
+    {"keyMercenaryToMaster",
+        defaultAction(&Actions::mercenaryToMaster),
+        InputCondition::INGAME,
+        "mercenarytomaster|mercmaster",
+        UseArgs_false,
+        Protected_false},
 };
 
 #undef defaultAction
-- 
cgit v1.2.3-60-g2f50