]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote-tracking branch 'origin/atheros/item_keys'
authorRudolf Polzer <divverent@xonotic.org>
Mon, 24 Oct 2011 09:54:50 +0000 (11:54 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Mon, 24 Oct 2011 09:54:50 +0000 (11:54 +0200)
commit6a47ec4c0ee07b6eaa3f9adac8f1fef262b8f81c
tree2994e8001aebf437d9e595a29101068feffa57f7
parent73aef95c051ecbb992e347ad5875924942b5d9ff
parent3eb07615a1d828cfe7d7243509820eb8ec7a90b0
Merge remote-tracking branch 'origin/atheros/item_keys'
qcsrc/server/cl_client.qc
qcsrc/server/defs.qh