de.git.xonotic.org Git - xonotic/xonotic-maps.pk3dir.git/commit

author	Sahil Singhal <sahil@sahil-desktop.(none)>
	Mon, 16 May 2011 18:51:48 +0000 (14:51 -0400)
committer	Sahil Singhal <sahil@sahil-desktop.(none)>
	Mon, 16 May 2011 18:51:48 +0000 (14:51 -0400)
commit	3ba264fd65eab2e8389009f793a0e0ad658d304a
tree	3d74c945553c1894bc5e3184d554ddff20f1d48d	tree \| snapshot
parent	267d944945daf227421964360c63d9f67c6330f0	commit \| diff
parent	38b521858183cb7194a081e9d477a302b938bce5	commit \| diff

Merge remote branch 'origin/master' into diabolik/afterslime

Conflicts:
scripts/shaderlist.txt