]> de.git.xonotic.org Git - xonotic/xonotic-maps.pk3dir.git/commitdiff
projects / xonotic / xonotic-maps.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 159ed06 7b5814f)
Merge remote branch 'origin/fruitiex/red-planet-zfight'
authorRudolf Polzer <divverent@alientrap.org>
Thu, 18 Nov 2010 06:25:16 +0000 (07:25 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Thu, 18 Nov 2010 06:25:16 +0000 (07:25 +0100)

Trivial merge