Merge branch 'master' of ssh://git.xonotic.org/xonotic

author Rudolf Polzer <divverent@alientrap.org>

Tue, 5 Oct 2010 20:08:12 +0000 (22:08 +0200)

committer Rudolf Polzer <divverent@alientrap.org>

Tue, 5 Oct 2010 20:08:12 +0000 (22:08 +0200)
author Rudolf Polzer <divverent@alientrap.org>
Tue, 5 Oct 2010 20:08:12 +0000 (22:08 +0200)
committer Rudolf Polzer <divverent@alientrap.org>
Tue, 5 Oct 2010 20:08:12 +0000 (22:08 +0200)
diff --cc misc/tools/xonotic-map-compiler-autobuild
Simple merge
author	Rudolf Polzer <divverent@alientrap.org>
	Tue, 5 Oct 2010 20:08:12 +0000 (22:08 +0200)
committer	Rudolf Polzer <divverent@alientrap.org>
	Tue, 5 Oct 2010 20:08:12 +0000 (22:08 +0200)