]> 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: 782f921 783f7b7)
Merge remote branch 'origin/mand1nga/waypoints_space-elevator'
authorRudolf Polzer <divverent@alientrap.org>
Sat, 4 Dec 2010 15:27:20 +0000 (16:27 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Sat, 4 Dec 2010 15:27:20 +0000 (16:27 +0100)

Trivial merge