]> 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: d0b8b04 ccb3e10)
Merge remote branch 'origin/tzork/turretfix'
authorRudolf Polzer <rpolzer@nb-04.(none)>
Fri, 26 Mar 2010 15:49:20 +0000 (16:49 +0100)
committerRudolf Polzer <rpolzer@nb-04.(none)>
Fri, 26 Mar 2010 15:49:20 +0000 (16:49 +0100)

Trivial merge