]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-data.pk3dir
authorRudolf Polzer <divverent@xonotic.org>
Thu, 16 Jun 2011 04:56:13 +0000 (06:56 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Thu, 16 Jun 2011 04:56:13 +0000 (06:56 +0200)
commit8624d069e527babc22b373e0dae4136172913c8f
tree9de5298810425ad100420440a79e1fe600eecc32
parent2f41bf8cdbfc8cb4a359c10a8d578b2a1c3eaf9d
parentaab81d189275fc603179b1ad983ef53cf89a6b75
Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-data.pk3dir