merge minetest/minetest_game master

69f284f9 · Milan · f4fc4294 · 69f284f9 · 045f1b9e
Commit 69f284f9 authored 8 years ago by Milan
--- a/.gitmodules
+++ b/.gitmodules
 [submodule "mods/boats"]
 	path = mods/boats
-	url = https://github.com/tenplus1/boats
+	url = https://github.com/tenplus1/boats.git
 [submodule "mods/illuna"]
 	path = mods/illuna
 	url = https://github.com/Illuna-Minetest/illuna

--- a/boats @ 045f1b9e
+++ b/boats @ 045f1b9e
+Subproject commit 045f1b9e678179da5362e5b52dd895c2f3ccc072