Merge branch 'master' of http://nl.git.xonotic.org/xonotic/xonotic-data.pk3dir
authorRudolf Polzer <divverent@alientrap.org>
Tue, 2 Nov 2010 16:41:02 +0000 (17:41 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Tue, 2 Nov 2010 16:41:02 +0000 (17:41 +0100)
commitc9582f364eb658cc3e9207f732fe9ff27c542f7a
tree22290d6872bd4a09081bc36b02db4f32be3783da
parent9d95434ffe42dc301ac1aef806bcad1d4eed1f66
parented68b47457e6a9e97acec9380adb5d7dd746cce7
Merge branch 'master' of nl.git.xonotic.org/xonotic/xonotic-data.pk3dir