]> 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: b55ee72 08e08ed)
Merge branch 'divVerent/anticheat-playerstats'
authorRudolf Polzer <divVerent@xonotic.org>
Tue, 15 Nov 2016 15:45:22 +0000 (10:45 -0500)
committerRudolf Polzer <divVerent@xonotic.org>
Tue, 15 Nov 2016 15:45:22 +0000 (10:45 -0500)

Trivial merge