diff options
| author | Japa | 2012-08-24 23:50:10 +0530 |
|---|---|---|
| committer | Japa | 2012-08-24 23:50:10 +0530 |
| commit | ca40092182c8cc937d3985d8f3e01c3855082c91 (patch) | |
| tree | 27932226ecec9a97cbe0da14050d2c207d4adc7c /resources | |
| parent | 5d4f06d785f8a9933679fe3caa12c18215e9674d (diff) | |
| parent | 9410fbcb1759e41481808d495ec442cbda87fac8 (diff) | |
| download | stonesense-ca40092182c8cc937d3985d8f3e01c3855082c91.tar.gz stonesense-ca40092182c8cc937d3985d8f3e01c3855082c91.tar.bz2 stonesense-ca40092182c8cc937d3985d8f3e01c3855082c91.tar.xz | |
Merge branch 'master' of https://github.com/JapaMala/stonesense
Conflicts:
MapLoading.cpp
resources/buildings/Craftsdwarfs.xml
Diffstat (limited to 'resources')
| -rw-r--r-- | resources/buildings/Craftsdwarfs.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/resources/buildings/Craftsdwarfs.xml b/resources/buildings/Craftsdwarfs.xml index d9c5adc..f893e83 100644 --- a/resources/buildings/Craftsdwarfs.xml +++ b/resources/buildings/Craftsdwarfs.xml @@ -1,5 +1,5 @@ -<?xml version="1.0" ?>
-<building name="Craftsdwarfs Workshop" game_type="Workshop" game_subtype="Craftsdwarfs" file="workshop.png">
+<?xml version="1.0" ?> +<building name="Craftsdwarfs Workshop" game_type="Workshop" game_subtype="Craftsdwarfs" file="workshop.png"> <!-- benches block -->
<if>
<!-- replace this with position index if required -->
|
