]> 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: 08f8a52 b360e3b)
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir
authorRudolf Polzer <divverent@alientrap.org>
Sat, 5 May 2012 10:35:03 +0000 (12:35 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Sat, 5 May 2012 10:35:03 +0000 (12:35 +0200)

Trivial merge