]> 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: 045d99e a142a0d)
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir
authorJan Behrens <zykure@web.de>
Sun, 27 Jan 2013 17:57:16 +0000 (18:57 +0100)
committerJan Behrens <zykure@web.de>
Sun, 27 Jan 2013 17:57:16 +0000 (18:57 +0100)
Conflicts:
qcsrc/server/playerstats.qc


Trivial merge