merge upstream

This commit is contained in:
tchncs 2016-10-04 22:01:05 +02:00
commit 55557a1415
2 changed files with 0 additions and 4 deletions

3
.gitmodules vendored
View file

@ -78,9 +78,6 @@
[submodule "mods/technic"] [submodule "mods/technic"]
path = mods/technic path = mods/technic
url = https://github.com/minetest-technic/technic url = https://github.com/minetest-technic/technic
[submodule "mods/flight"]
path = mods/flight
url = https://github.com/Amaz1/flight
[submodule "mods/playereffects"] [submodule "mods/playereffects"]
path = mods/playereffects path = mods/playereffects
url = git://repo.or.cz/minetest_playereffects.git url = git://repo.or.cz/minetest_playereffects.git

@ -1 +0,0 @@
Subproject commit 82ddbce69109144ec85fe3dcf13e431c9d89c9e4