]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into divVerent/crypto2
authorRudolf Polzer <divverent@alientrap.org>
Sat, 2 Oct 2010 19:18:11 +0000 (21:18 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Sat, 2 Oct 2010 19:18:11 +0000 (21:18 +0200)
commitb14c545d2699e29ef2b6261c6215ff6cff8afb8f
tree3cb1d960f3da02893b6f7f3cbf4a5aea274868d8
parent6af4e73de035e6bbed9ba2d60e0768c43dc66f2a
parentc50c892a7895b8a90e948003b7013ac06c6163f8
Merge branch 'master' into divVerent/crypto2

Conflicts:
qcsrc/server/ipban.qc
qcsrc/server/ipban.qc