From bba9d9fc807a28dc485a8c214d7425cb95285636 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Wed, 10 Oct 2012 08:29:27 +0200
Subject: MORTEVIELLE: Fix merge

---
 engines/configure.engines | 1 +
 engines/plugins_table.h   | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/engines/configure.engines b/engines/configure.engines
index a8eb89a7fa..ee29e3223a 100644
--- a/engines/configure.engines
+++ b/engines/configure.engines
@@ -24,6 +24,7 @@ add_engine lastexpress "The Last Express" no "" "" "16bit"
 add_engine lure "Lure of the Temptress" yes
 add_engine made "MADE" yes
 add_engine mohawk "Mohawk" yes "cstime myst riven" "Living Books"
+add_engine mortevielle "Mortevielle" no
 add_engine cstime "Where in Time is Carmen Sandiego?" no
 add_engine riven "Riven: The Sequel to Myst" no "" "" "16bit"
 add_engine myst "Myst" no "" "" "16bit"
diff --git a/engines/plugins_table.h b/engines/plugins_table.h
index 010de0d5e2..5097c87a9d 100644
--- a/engines/plugins_table.h
+++ b/engines/plugins_table.h
@@ -41,6 +41,9 @@ LINK_PLUGIN(HUGO)
 #if PLUGIN_ENABLED_STATIC(KYRA)
 LINK_PLUGIN(KYRA)
 #endif
+#if PLUGIN_ENABLED_STATIC(MORTEVIELLE)
+LINK_PLUGIN(MORTEVIELLE)
+#endif
 #if PLUGIN_ENABLED_STATIC(LASTEXPRESS)
 LINK_PLUGIN(LASTEXPRESS)
 #endif
-- 
cgit v1.2.3