]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote branch 'refs/remotes/origin/mirceakitsune/campingrifle_slot_change'
authorRudolf Polzer <divverent@alientrap.org>
Fri, 29 Oct 2010 15:27:04 +0000 (17:27 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Fri, 29 Oct 2010 15:27:04 +0000 (17:27 +0200)
commit3f6f46ac354ca148d1ba475b125073d9309865cc
tree0883355509aa49b50156936f4c372524a2640a3e
parentf8783cff9423e6a098ad3f0d08840c091246e905
parentddb71d33bcf0ed1d60fd7c900f4f963f33284bca
Merge remote branch 'refs/remotes/origin/mirceakitsune/campingrifle_slot_change'