]> 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: 318039b 116d761)
Merge remote branch 'origin/tzork/turrets'
authorRudolf Polzer <divverent@alientrap.org>
Sat, 16 Oct 2010 19:36:52 +0000 (21:36 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Sat, 16 Oct 2010 19:36:52 +0000 (21:36 +0200)

Trivial merge