]> 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: 297e90c 903e3d2)
Merge remote branch 'origin/samual/replace_rifle_secondary_sound'
authorRudolf Polzer <divVerent@xonotic.org>
Mon, 29 Aug 2011 07:30:09 +0000 (09:30 +0200)
committerRudolf Polzer <divVerent@xonotic.org>
Mon, 29 Aug 2011 07:30:09 +0000 (09:30 +0200)

Trivial merge