]> 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: c0a62f7 0a103f2)
Merge remote branch 'refs/remotes/origin/tzork/turrets'
authorRudolf Polzer <divverent@alientrap.org>
Sat, 15 May 2010 18:14:42 +0000 (20:14 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Sat, 15 May 2010 18:14:42 +0000 (20:14 +0200)

Trivial merge