Merge support for anaglyph stereo

author PilzAdam <adam-k@outlook.com>

Sat, 1 Dec 2012 11:41:05 +0000 (12:41 +0100)

committer PilzAdam <adam-k@outlook.com>

Sat, 1 Dec 2012 11:41:05 +0000 (12:41 +0100)
author PilzAdam <adam-k@outlook.com>
Sat, 1 Dec 2012 11:41:05 +0000 (12:41 +0100)
committer PilzAdam <adam-k@outlook.com>
Sat, 1 Dec 2012 11:41:05 +0000 (12:41 +0100)
diff --cc minetest.conf.example
Simple merge
diff --cc src/defaultsettings.cpp
Simple merge
diff --cc src/game.cpp
Simple merge
author	PilzAdam <adam-k@outlook.com>
	Sat, 1 Dec 2012 11:41:05 +0000 (12:41 +0100)
committer	PilzAdam <adam-k@outlook.com>
	Sat, 1 Dec 2012 11:41:05 +0000 (12:41 +0100)
		1	2
minetest.conf.example	patch \|	diff1 \|	diff2 \|	blob \| history
src/defaultsettings.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
src/game.cpp	patch \|	diff1 \|	diff2 \|	blob \| history