Merge branch 'master' of ssh://git.xonotic.org/xonotic-data.pk3dir
authorFruitieX <rasse@rasse-laptop.(none)>
Tue, 12 Oct 2010 13:17:58 +0000 (16:17 +0300)
committerFruitieX <rasse@rasse-laptop.(none)>
Tue, 12 Oct 2010 13:17:58 +0000 (16:17 +0300)
commit31db6b3b90dd4b14fc6f14600718c8db01586d6a
tree6537c190cf854adc9ca2d79bac7fd326f5636b75
parentcb1743b559bd61735945591fc29b870f2ba48b85
parent328e88c22c6dd30e5b09da92c0cbc4db029e3955
Merge branch 'master' of ssh://git.xonotic.org/xonotic-data.pk3dir