Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-data.pk3dir
authorRudolf Polzer <divVerent@xonotic.org>
Thu, 20 Jan 2011 12:56:34 +0000 (13:56 +0100)
committerRudolf Polzer <divVerent@xonotic.org>
Thu, 20 Jan 2011 12:56:34 +0000 (13:56 +0100)
commit166d02f84387480da68ddc60346af1202297ce19
tree7c4a8fea826bbc80ae3a377ba1cbf199e95425d5
parenta3f6efc7c1d0bf84af6182c966dc1da326030f99
parent6d1c5d967d027c92815bba88fa8cc3ca77f84615
Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-data.pk3dir