Merge branch 'master' into tzork/ents-onoff
authorJakob MG <jakob_mg@hotmail.com>
Tue, 28 Sep 2010 09:54:21 +0000 (11:54 +0200)
committerJakob MG <jakob_mg@hotmail.com>
Tue, 28 Sep 2010 09:54:21 +0000 (11:54 +0200)
commitbc51fd3d6308269b5ad770ef62b23fe98ee2cfe1
tree08d603cf34befc5876fd4798077659e6e822d4bd
parent9511d71f751134e35fb136548445749449e0aaec
parentd341292a70c9866b19c3c63ea14470415bec0d6f
Merge branch 'master' into tzork/ents-onoff

Conflicts:
qcsrc/server/defs.qh
qcsrc/server/defs.qh
qcsrc/server/g_triggers.qc