]> 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 | compact (merge: 7e77f3a 596f6da)
Merge branch 'master' of ssh://git.xonotic.org/xonotic-data.pk3dir
authorRudolf Polzer <divverent@alientrap.org>
Thu, 28 Oct 2010 13:12:39 +0000 (15:12 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Thu, 28 Oct 2010 13:12:39 +0000 (15:12 +0200)

Trivial merge