Normal maps generation on the fly.
Parallax mapping with slope information.
Overriding normal maps.
Fix serializing of signed numbers in serializeStructToString
Merge remote-tracking branch 'minetest/master'

Conflicts:
	builtin/mainmenu.lua
	client/shaders/alpha_shader/opengl_fragment.glsl
	client/shaders/leaves_shader/opengl_fragment.glsl
	client/shaders/liquids_shader/opengl_fragment.glsl
	client/shaders/liquids_shader/opengl_vertex.glsl
	client/shaders/plants_shader/opengl_fragment.glsl
	client/shaders/solids_shader/opengl_fragment.glsl
Fix "ghost stacks" created when a player clicks an item on the ground:
since the object is not immediately removed, any other code may still
think an object is there, therefore leading to item duplication. This code
therefore sets the itemstring to '' after the object is picked up to avoid
such issues
include the yum install command for fedora

took me a while to find out that `libjpeg-dev` on debian was `libjpeg-turbo-devel` on fedora >.>
Merge pull request #60 from asl97/patch-2

include the yum install command for fedora
Fix double sending of chat messages
Merge remote-tracking branch 'minetest/master'
Set -std=c++0x in CMakeLists.txt

Conflicts:
	src/cmake_config.h.in
Fix merge mistake when rebasing for PR #1169
Merge remote-tracking branch 'minetest/master'

Conflicts:
	src/environment.cpp
Fix crash/error on main menu

Easy to reproduce, start minetest in such a way that the Client tab
opens first, with the username box already filled in. (in other words,
you've played it before, and used Client last time). The password box
will have focus. Press cursor up. Lua 'crash'.
fix ele if
Disable media downloading for non gui clients
Farmesh optimize
Disable useless profiler
update games/default
Your bunny wrote
Merge remote-tracking branch 'upstream/master' into farmesh3

Conflicts:
	src/defaultsettings.cpp
	src/game.cpp