Merge remote branches 'origin/fruitiex/hud_damage-dmg_take' and 'origin/divVerent...
authorRudolf Polzer <divverent@alientrap.org>
Tue, 21 Dec 2010 06:17:23 +0000 (07:17 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Tue, 21 Dec 2010 06:17:23 +0000 (07:17 +0100)
commit3f05fffaca85fdb6af5f1d5baeeded5a3b45ce0f
treeb216da3ba91f9b7a74e8d8235934dd52f21b8b48
parent36c5d4c7513a8b47aa7e5efacb6814917b6c0b33
parent20f9a12b89302cc0f8d8a3209a9165897fb84765
Merge remote branches 'origin/fruitiex/hud_damage-dmg_take' and 'origin/divVerent/virtual-mirror-damage'
defaultXonotic.cfg
qcsrc/server/g_damage.qc