Luanti/minetest_game
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix mergeconflicts

Browse source 
readd submodule boats+farming
This commit is contained in:
Milan* 2016-12-15 18:51:42 +00:00
parent 90ad2b6689
commit c74b9c968d
3 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
.gitmodules vendored
View file

@ -131,9 +131,9 @@
[submodule "mods/moresnow"] [submodule "mods/moresnow"]
path = mods/moresnow path = mods/moresnow
url = https://github.com/Sokomine/moresnow url = https://github.com/Sokomine/moresnow
[submodule "mods/boats"]
path = mods/boats
url = https://git.tchncs.de/Illuna-Minetest/boats
[submodule "mods/farming"] [submodule "mods/farming"]
path = mods/farming path = mods/farming
url = https://git.tchncs.de/Illuna-Minetest/farming url = https://git.tchncs.de/Illuna-Minetest/farming
[submodule "mods/boats"]
path = mods/boats
url = https://git.tchncs.de/Illuna-Minetest/boats

1
mods/homedecor_modpack

@ -1 +0,0 @@
Subproject commit 8638435b42ab57d50a3f5ec229d3821e659cf828

1
mods/irc

@ -1 +0,0 @@
Subproject commit 18f286f4b51ecdffa3744c96b2223912d8e812cf