]> git.rm.cloudns.org Git - xonotic/xonotic-maps.pk3dir.git/commitdiff
projects / xonotic / xonotic-maps.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7259010 1021635)
Merge remote branch 'origin/divVerent/redplanet-recompile'
authorRudolf Polzer <divverent@alientrap.org>
Sun, 14 Nov 2010 18:06:56 +0000 (19:06 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Sun, 14 Nov 2010 18:06:56 +0000 (19:06 +0100)

Trivial merge