]> 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: a7057ab 952b293)
Merge branch 'master' of ssh://git.xonotic.org/xonotic-data.pk3dir
authorRudolf Polzer <divverent@alientrap.org>
Fri, 17 Sep 2010 22:46:35 +0000 (00:46 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Fri, 17 Sep 2010 22:46:35 +0000 (00:46 +0200)

Trivial merge