]> 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: edbe307 b51629c)
Merge remote-tracking branch 'origin/master' into fruitiex/playerstats
authorFruitieX <fruitiex@gmail.com>
Tue, 17 May 2011 19:57:38 +0000 (22:57 +0300)
committerFruitieX <fruitiex@gmail.com>
Tue, 17 May 2011 19:57:38 +0000 (22:57 +0300)
1  2 
qcsrc/server/playerstats.qc patch | diff1 | diff2 | blob | history

diff --cc qcsrc/server/playerstats.qc
Simple merge