Merge branch 'master' of ssh://git.xonotic.org/xonotic
authorRudolf Polzer <divverent@alientrap.org>
Tue, 5 Oct 2010 20:08:12 +0000 (22:08 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Tue, 5 Oct 2010 20:08:12 +0000 (22:08 +0200)
commit338d89ad41e81f14b2620e028530c1f23a13c523
tree063dfe17417947ad5bc249dcebad119920ef7aba
parent412fb97359bc6caaf37f06693ab08ce50308d22c
parent6cb5c2a941ccb6a7517caad14e852bdef92a02c9
Merge branch 'master' of ssh://git.xonotic.org/xonotic
misc/tools/xonotic-map-compiler-autobuild