]> 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: 102a364 27c92bb)
Merge branch 'divVerent/weapon_stay_2'
authorRudolf Polzer <divverent@alientrap.org>
Sat, 17 Dec 2011 21:38:48 +0000 (22:38 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Sat, 17 Dec 2011 21:38:48 +0000 (22:38 +0100)

Trivial merge