]> 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: d250986 6ac6997)
Merge remote branch 'refs/remotes/origin/tzork/turrets'
authorRudolf Polzer <divverent@alientrap.org>
Tue, 19 Oct 2010 05:47:27 +0000 (07:47 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Tue, 19 Oct 2010 05:47:27 +0000 (07:47 +0200)

Trivial merge