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

resolve mergeconflicts

Browse source
This commit is contained in:
Milan 2018-09-28 12:24:01 +02:00
commit 2c80637c84
2 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
.gitmodules vendored
View file

@ -1,6 +1,9 @@
[submodule "mods/illuna"] [submodule "mods/illuna"]
path = mods/illuna path = mods/illuna
url = https://git.tchncs.de/Illuna-Minetest/illuna.git url = https://git.tchncs.de/Illuna-Minetest/illuna.git
[submodule "mods/wine"]
path = mods/wine
url = https://notabug.org/TenPlus1/wine
[submodule "mods/death_messages"] [submodule "mods/death_messages"]
path = mods/death_messages path = mods/death_messages
url = https://git.tchncs.de/Illuna-Minetest/death_messages.git url = https://git.tchncs.de/Illuna-Minetest/death_messages.git
@ -53,6 +56,9 @@
[submodule "mods/halloween_mobs"] [submodule "mods/halloween_mobs"]
path = mods/halloween_mobs path = mods/halloween_mobs
url = https://git.tchncs.de/Illuna-Minetest/halloween_mobs url = https://git.tchncs.de/Illuna-Minetest/halloween_mobs
[submodule "mods/protector"]
path = mods/protector
url = https://notabug.org/TenPlus1/protector
[submodule "mods/ethereal"] [submodule "mods/ethereal"]
path = mods/ethereal path = mods/ethereal
url = https://git.tchncs.de/Illuna-Minetest/ethereal url = https://git.tchncs.de/Illuna-Minetest/ethereal
@ -215,12 +221,6 @@
[submodule "mods/playereffects"] [submodule "mods/playereffects"]
path = mods/playereffects path = mods/playereffects
url = https://git.tchncs.de/Illuna-Minetest/playereffects url = https://git.tchncs.de/Illuna-Minetest/playereffects
[submodule "mods/wine"] [submodule "mods/chat3"]
path = mods/wine path = mods/chat3
url = https://notabug.org/TenPlus1/wine url = https://git.tchncs.de/Illuna-Minetest/chat3
[submodule "mods/protector"]
path = mods/protector
url = https://notabug.org/TenPlus1/protector
[submodule "mods/matrix_chat"]
path = mods/matrix_chat
url = https://github.com/diggers-mt/matrix_chat

1
mods/chat3 Submodule

@ -0,0 +1 @@
Subproject commit dd2d80239496f791d88b2f15b46f73d197d38525