Merge branch 'http' of gitorious.org:minetest-classic/minetest-classic into http

Browse Source

Conflicts:
	src/http.cpp
	src/main.cpp
	src/servermain.cpp

...

This commit is contained in:

darkrose 2013-11-30 20:19:06 +10:00

parent bed52ca605 4a735d140e

commit be72505add

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available