]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c1af3f3 23fc0e8)
Merge remote-tracking branch 'origin/terencehill/g_changeteam_banned_fix'
authorRudolf Polzer <divverent@alientrap.org>
Mon, 12 Dec 2011 08:44:27 +0000 (09:44 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Mon, 12 Dec 2011 08:44:27 +0000 (09:44 +0100)
1  2 
qcsrc/server/clientcommands.qc patch | diff1 | diff2 | blob | history

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