Merge commit '6f440770dbdb' into atheros/item_keys
authorPrzemysław Grzywacz <nexather@gmail.com>
Tue, 18 Oct 2011 17:38:00 +0000 (19:38 +0200)
committerPrzemysław Grzywacz <nexather@gmail.com>
Tue, 18 Oct 2011 17:38:00 +0000 (19:38 +0200)
commit74a82a7354648fcc2698c19afc0581f7bdc3b1ca
tree3b7fb9aa1b1bd0dcb1ad829c6440529304e7a9c2
parent35cead54720591ea1770c63104e53bde54f2c240
parent6f440770dbdb1c39b04accd0ccf760a89f72fd12
Merge commit '6f440770dbdb' into atheros/item_keys
qcsrc/server/cl_client.qc
qcsrc/server/defs.qh
qcsrc/server/progs.src
qcsrc/server/t_plats.qc