]> 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: 0f337c6 c64c329)
Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-maps.pk3dir
authorRudolf Polzer <divverent@alientrap.org>
Wed, 26 Jan 2011 07:55:36 +0000 (08:55 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Wed, 26 Jan 2011 07:55:36 +0000 (08:55 +0100)

Trivial merge