merge upstream

dbe99710 · Milan · a07c50df · f2553fc3 · dbe99710 · dbe99710
Commit dbe99710 authored 8 years ago by Milan
--- a/mods/default/textures/default_fence_acacia_wood.png
+++ b/mods/default/textures/default_fence_acacia_wood.png
--- a/mods/default/textures/default_fence_aspen_wood.png
+++ b/mods/default/textures/default_fence_aspen_wood.png
--- a/mods/default/textures/default_fence_junglewood.png
+++ b/mods/default/textures/default_fence_junglewood.png
--- a/mods/default/textures/default_fence_overlay.png.1
+++ b/mods/default/textures/default_fence_overlay.png.1
--- a/mods/default/textures/default_fence_pine_wood.png
+++ b/mods/default/textures/default_fence_pine_wood.png
--- a/mods/default/textures/default_fence_wood.png
+++ b/mods/default/textures/default_fence_wood.png