]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4fc171e 54db6e2)
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)

Trivial merge