Merge branch 'master' of ssh://git.xonotic.org/xonotic-maps.pk3dir
authorRudolf Polzer <divverent@alientrap.org>
Tue, 8 Jun 2010 10:03:28 +0000 (12:03 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Tue, 8 Jun 2010 10:03:28 +0000 (12:03 +0200)
commit71cf38f38306dda1f6c92c721b696aeddfe301ea
treec7abe4914ef6c4056addfab636a9d4ec88395f12
parent04385ebfebbffe415939f0ec195fbb1919fd9b10
parentcfb5c991a652b1463c0f9b3066bc2e611a99859c
Merge branch 'master' of ssh://git.xonotic.org/xonotic-maps.pk3dir