]> 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 | compact (merge: 153bc44 7fe45f1)
Merge remote branch 'refs/remotes/origin/fruitiex/nerfstrafing'
authorRudolf Polzer <divverent@alientrap.org>
Fri, 4 Jun 2010 18:20:59 +0000 (20:20 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Fri, 4 Jun 2010 18:20:59 +0000 (20:20 +0200)

Trivial merge