Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-data.pk3dir
authorRudolf Polzer <divVerent@xonotic.org>
Tue, 28 Dec 2010 18:35:09 +0000 (19:35 +0100)
committerRudolf Polzer <divVerent@xonotic.org>
Tue, 28 Dec 2010 18:35:09 +0000 (19:35 +0100)
commitd856872f38d8147c74435268fb5778cb001093b5
tree5824c8d38893515d75f974c26865ddb543c069d7
parent0cbe35ff35640ee710ef8c143671e013ea4a3cf8
parent96a0a904730ee4c61e68d8b94ebf67fbee0ff6ba
Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-data.pk3dir