Merge remote-tracking branch 'origin/nifrek/hagar_own_traileffect_fix'
authorRudolf Polzer <divverent@alientrap.org>
Mon, 12 Dec 2011 08:38:22 +0000 (09:38 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Mon, 12 Dec 2011 08:38:22 +0000 (09:38 +0100)
commitc1af3f3b1a02a1c7596d75c912f8750ebbb2587b
treee30e45aeaf3bdecbde844825a28f29e3036031eb
parent37b68c473f411c96bd746069ccc915a04447a15c
parent95f35a0dc0ce9e43d27cf968d63a4711c0155f17
Merge remote-tracking branch 'origin/nifrek/hagar_own_traileffect_fix'

Conflicts:
effectinfo.txt
effectinfo.txt
qcsrc/client/projectile.qc