]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
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)
commit3aa63c6febb90af279ac168b8c50dc0981e9f903
tree0024d57987b4a819a23c6238589af789b80e275c
parent045d99effff66234921edeb95f9246ef05ae422a
parenta142a0db79432d7f621e4f20eaee580ca5f3793e
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir

Conflicts:
qcsrc/server/playerstats.qc