From d880bf281a646d0e6b7cf0ae455d1e6849e48e02 Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno.rehling@gmail.com>
Date: Sun, 17 Jun 2012 11:30:11 -0700
Subject: [PATCH] remove WAR, PEACE, JIHAD

---
 src/kernel/config.c | 3 ---
 src/kernel/types.h  | 3 ---
 2 files changed, 6 deletions(-)

diff --git a/src/kernel/config.c b/src/kernel/config.c
index 000f0d5e3..e66dc0f79 100644
--- a/src/kernel/config.c
+++ b/src/kernel/config.c
@@ -399,8 +399,6 @@ const char *keywords[MAXKEYWORDS] = {
   "ENDE",
   "FAHREN",
   "NUMMER",
-  "KRIEG",
-  "FRIEDEN",
   "FOLGEN",
   "FORSCHEN",
   "GIB",
@@ -439,7 +437,6 @@ const char *keywords[MAXKEYWORDS] = {
   "PIRATERIE",
   "GRUPPE",
   "SORTIEREN",
-  "JIHAD",
   "GM",
   "INFO",
   "PRAEFIX",
diff --git a/src/kernel/types.h b/src/kernel/types.h
index 3c5a11dcf..ed895bfdd 100644
--- a/src/kernel/types.h
+++ b/src/kernel/types.h
@@ -90,8 +90,6 @@ typedef enum {
   K_END,
   K_DRIVE,
   K_NUMBER,
-  K_WAR,
-  K_PEACE,
   K_FOLLOW,
   K_RESEARCH,
   K_GIVE,
@@ -130,7 +128,6 @@ typedef enum {
   K_PIRACY,
   K_GROUP,
   K_SORT,
-  K_SETJIHAD,
   K_GM,                         /* perform GM commands */
   K_INFO,                       /* set player-info */
   K_PREFIX,