merge upstream 🐈

This commit is contained in:
Milan* 2017-03-20 22:40:16 +01:00
commit 7f2d4f4fbf
3 changed files with 5 additions and 1 deletions

3
.gitmodules vendored
View file

@ -149,3 +149,6 @@
[submodule "mods/fun_caves"]
path = mods/fun_caves
url = https://git.tchncs.de/Illuna-Minetest/fun_caves
[submodule "mods/unifieddyes"]
path = mods/unifieddyes
url = https://github.com/minetest-mods/unifieddyes

@ -1 +1 @@
Subproject commit e46ff3488b4cae227a84fd71cbb321f91f446412
Subproject commit 5517be8ff2a99ef104c795ce6b726133dd7cc8a1

1
mods/unifieddyes Submodule

@ -0,0 +1 @@
Subproject commit 726bb75e1d0daa36d4c95fb675bc672badad7a77