Brandon 8ce248b281 Merge remote-tracking branch 'minetest/master' ... Conflicts: src/defaultsettings.cpp src/environment.cpp src/game.cpp src/itemdef.cpp src/map.cpp src/server.h		2017-02-11 21:10:04 -06:00
..
serverlist	Add a list of servers to the "Multiplayer" tab	2013-01-21 16:42:56 +02:00
shaders	Fix fog weirdness (#5146)	2017-01-31 08:42:39 +01:00
sounds	Client side ambiance	2015-06-18 13:15:06 -05:00