]> 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 | compact (merge: a534edc 19c616b)
Merge remote branch 'refs/remotes/origin/fruitiex/tenshihanpack'
authorRudolf Polzer <divverent@alientrap.org>
Tue, 19 Oct 2010 06:37:34 +0000 (08:37 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Tue, 19 Oct 2010 06:37:34 +0000 (08:37 +0200)

Trivial merge