merge upstream

This commit is contained in:
tchncs 2016-09-04 23:42:08 +02:00
commit 09b84d216a
2 changed files with 4 additions and 4 deletions

6
.gitmodules vendored
View file

@ -59,9 +59,6 @@
[submodule "mods/pkarcs"]
path = mods/pkarcs
url = https://git.tchncs.de/Illuna-Minetest/pkarcs
[submodule "mods/columnia"]
path = mods/columnia
url = https://git.tchncs.de/Illuna-Minetest/columnia
[submodule "mods/farming"]
path = mods/farming
url = https://git.tchncs.de/Illuna-Minetest/farming
@ -71,3 +68,6 @@
[submodule "mods/technic_chests"]
path = mods/technic_chests
url = https://git.tchncs.de/Illuna-Minetest/technic_chests
[submodule "mods/columnia"]
path = mods/columnia
url = https://git.tchncs.de/Illuna-Minetest/columnia

@ -1 +1 @@
Subproject commit e5f5bd3168419ee5519e75dc8c9ed2e63c740df9
Subproject commit d19ac06a5e1715e7bd157859405e09f83c1f7a13