]> 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 | combined (merge: 13637d8 16e148e)
Merge remote branch 'origin/tzork/turrets-assualt-fix'
authorRudolf Polzer <divVerent@xonotic.org>
Fri, 19 Nov 2010 11:42:47 +0000 (12:42 +0100)
committerRudolf Polzer <divVerent@xonotic.org>
Fri, 19 Nov 2010 11:42:47 +0000 (12:42 +0100)

Trivial merge