]> 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: 2e201d1 d8dc92d)
Merge branch 'master' of ssh://git.xonotic.org/xonotic-data.pk3dir
authorRudolf Polzer <divverent@alientrap.org>
Fri, 7 Jan 2011 20:35:47 +0000 (21:35 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Fri, 7 Jan 2011 20:35:47 +0000 (21:35 +0100)

Trivial merge