]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote branch 'origin/terencehill/weapon_stay_fix'
authorRudolf Polzer <divVerent@xonotic.org>
Wed, 31 Aug 2011 13:47:53 +0000 (15:47 +0200)
committerRudolf Polzer <divVerent@xonotic.org>
Wed, 31 Aug 2011 13:47:53 +0000 (15:47 +0200)
commit7ed5fe55847a986ea514113e64cc78d6a00cf7e2
tree8813073e332847b662042f031714803ef4a341db
parent4fc171e433716f703a2136c8a7ca4a7e286a8f1c
parent54db6e2ca49e7cb6b3a905299c6a17cb854e9521
Merge remote branch 'origin/terencehill/weapon_stay_fix'