summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
Diffstat (limited to 'data')
-rw-r--r--data/009-1.wlkbin8779 -> 8779 bytes
-rw-r--r--data/009-2.wlkbin24004 -> 24004 bytes
-rwxr-xr-x[-rw-r--r--]data/027-3.wlkbin13504 -> 13504 bytes
-rwxr-xr-xdata/027-4.wlkbin0 -> 8004 bytes
-rwxr-xr-xdata/debugroom.wlkbin0 -> 2504 bytes
-rw-r--r--data/resnametable.txt71
6 files changed, 71 insertions, 0 deletions
diff --git a/data/009-1.wlk b/data/009-1.wlk
index 87fa7a02..0ec51666 100644
--- a/data/009-1.wlk
+++ b/data/009-1.wlk
Binary files differ
diff --git a/data/009-2.wlk b/data/009-2.wlk
index 06d01de3..8db718f3 100644
--- a/data/009-2.wlk
+++ b/data/009-2.wlk
Binary files differ
diff --git a/data/027-3.wlk b/data/027-3.wlk
index 4023c354..5e676641 100644..100755
--- a/data/027-3.wlk
+++ b/data/027-3.wlk
Binary files differ
diff --git a/data/027-4.wlk b/data/027-4.wlk
new file mode 100755
index 00000000..2d0ec6c9
--- /dev/null
+++ b/data/027-4.wlk
Binary files differ
diff --git a/data/debugroom.wlk b/data/debugroom.wlk
new file mode 100755
index 00000000..abf8574b
--- /dev/null
+++ b/data/debugroom.wlk
Binary files differ
diff --git a/data/resnametable.txt b/data/resnametable.txt
index cd3404e8..360606c6 100644
--- a/data/resnametable.txt
+++ b/data/resnametable.txt
@@ -1,3 +1,73 @@
+<<<<<<< HEAD
+001-1.gat#001-1.wlk#
+001-2.gat#001-2.wlk#
+001-3.gat#001-3.wlk#
+001-4.gat#001-4.wlk#
+002-1.gat#002-1.wlk#
+002-2.gat#002-2.wlk#
+002-3.gat#002-3.wlk#
+002-4.gat#002-4.wlk#
+003-1.gat#003-1.wlk#
+003-2.gat#003-2.wlk#
+004-1.gat#004-1.wlk#
+004-2.gat#004-2.wlk#
+005-1.gat#005-1.wlk#
+005-3.gat#005-3.wlk#
+006-1.gat#006-1.wlk#
+006-3.gat#006-3.wlk#
+007-1.gat#007-1.wlk#
+008-1.gat#008-1.wlk#
+009-1.gat#009-1.wlk#
+009-2.gat#009-2.wlk#
+009-3.gat#009-3.wlk#
+010-1.gat#010-1.wlk#
+010-2.gat#010-2.wlk#
+011-1.gat#011-1.wlk#
+011-3.gat#011-3.wlk#
+011-4.gat#011-4.wlk#
+011-5.gat#011-5.wlk#
+012-1.gat#012-1.wlk#
+012-3.gat#012-3.wlk#
+012-4.gat#012-4.wlk#
+013-1.gat#013-1.wlk#
+013-2.gat#013-2.wlk#
+013-3.gat#013-3.wlk#
+014-1.gat#014-1.wlk#
+014-3.gat#014-3.wlk#
+015-1.gat#015-1.wlk#
+015-3.gat#015-3.wlk#
+016-1.gat#016-1.wlk#
+017-1.gat#017-1.wlk#
+017-2.gat#017-2.wlk#
+017-9.gat#017-9.wlk#
+018-1.gat#018-1.wlk#
+018-2.gat#018-2.wlk#
+018-3.gat#018-3.wlk#
+019-1.gat#019-1.wlk#
+020-1.gat#020-1.wlk#
+020-2.gat#020-2.wlk#
+020-3.gat#020-3.wlk#
+020-4.gat#020-4.wlk#
+021-1.gat#021-1.wlk#
+021-2.gat#021-2.wlk#
+021-8.gat#021-8.wlk#
+022-1.gat#022-1.wlk#
+023-1.gat#023-1.wlk#
+024-1.gat#024-1.wlk#
+024-2.gat#024-2.wlk#
+025-1.gat#025-1.wlk#
+026-1.gat#026-1.wlk#
+027-1.gat#027-1.wlk#
+027-2.gat#027-2.wlk#
+027-3.gat#027-3.wlk#
+027-4.gat#027-4.wlk#
+028-1.gat#028-1.wlk#
+028-3.gat#028-3.wlk#
+029-1.gat#029-1.wlk#
+029-3.gat#029-3.wlk#
+botcheck.gat#botcheck.wlk#
+debugroom.gat#debugroom.wlk#
+=======
001-1.gat#001-1.wlk#
001-2.gat#001-2.wlk#
001-3.gat#001-3.wlk#
@@ -72,3 +142,4 @@
032-3.gat#032-3.wlk#
botcheck.gat#botcheck.wlk#
+>>>>>>> 1e1e26e1255a487a14ca99c60c3ab51ad3988f9b