]> git.xonotic.org Git - xonotic/xonotic-maps.pk3dir.git/commitdiff
projects / xonotic / xonotic-maps.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1b8113c bebd5a8)
Merge remote branch 'origin/fruitiex/stormkeep_playerclip'
authorRudolf Polzer <divverent@alientrap.org>
Mon, 15 Nov 2010 20:54:53 +0000 (21:54 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Mon, 15 Nov 2010 20:54:53 +0000 (21:54 +0100)

Trivial merge