]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 616c748 f2920bc)
Merge branch 'master' into divVerent/speedlimit
authorRudolf Polzer <divverent@alientrap.org>
Tue, 25 May 2010 14:57:37 +0000 (16:57 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Tue, 25 May 2010 14:57:37 +0000 (16:57 +0200)

Trivial merge