]> 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: 04385eb cfb5c99)
Merge branch 'master' of ssh://git.xonotic.org/xonotic-maps.pk3dir
authorRudolf Polzer <divverent@alientrap.org>
Tue, 8 Jun 2010 10:03:28 +0000 (12:03 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Tue, 8 Jun 2010 10:03:28 +0000 (12:03 +0200)

Trivial merge