From 79fc89036df48cb2e6cb1ad792d4b306100cddf6 Mon Sep 17 00:00:00 2001
From: Flugente <Flugente@4f8fa57e-7814-0410-bad4-adc449f26b7c>
Date: Wed, 2 Oct 2013 21:42:01 +0000
Subject: [PATCH] Fix: missing merge lookup

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1802 4f8fa57e-7814-0410-bad4-adc449f26b7c
---
 gamedir/Data-1.13/TableData/Lookup/MergeType.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/gamedir/Data-1.13/TableData/Lookup/MergeType.xml b/gamedir/Data-1.13/TableData/Lookup/MergeType.xml
index 86181be45..b76f1392e 100644
--- a/gamedir/Data-1.13/TableData/Lookup/MergeType.xml
+++ b/gamedir/Data-1.13/TableData/Lookup/MergeType.xml
@@ -48,4 +48,8 @@
 		<id>11</id>
 		<name>Mechanical (Hard)</name>
 	</MergeType>
+	<MergeType>
+		<id>12</id>
+		<name>Tripwire Roll</name>
+	</MergeType>
 </JA2Data>
\ No newline at end of file