]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote-tracking branch 'origin/terencehill/infinite_ammo'
authorRudolf Polzer <divverent@xonotic.org>
Sun, 21 Aug 2011 18:34:29 +0000 (20:34 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Sun, 21 Aug 2011 18:34:29 +0000 (20:34 +0200)
commit5bad3c7afd764ecf5957604854c83cc5ee5a6f30
tree831372b2524209a0a802b41151c2111e8ee7763c
parent470963d2572f119731764f1f7c6a5078d23fae66
parente3e13a6eac82464c004af16230f1da2b92776636
Merge remote-tracking branch 'origin/terencehill/infinite_ammo'