]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into MaidenBeast/translation_updates
authorMaidenBeast <fel.sallustio@gmail.com>
Mon, 27 Jun 2011 11:29:05 +0000 (13:29 +0200)
committerMaidenBeast <fel.sallustio@gmail.com>
Mon, 27 Jun 2011 11:29:05 +0000 (13:29 +0200)
commit4d89135c486ca6d2b04118cf861c28f557ab4d30
tree3534f3b3f4aa53e656d256005345e079cf51b65c
parent0dc71ba83259fe64d0d821d1927d1e57f3fe3719
parent428511ff1564d7003ba967284c7ea504d38d1d33
Merge branch 'master' into MaidenBeast/translation_updates