Merge remote-tracking branch 'origin/mirceakitsune/func_train_beizer_curve'
authorRudolf Polzer <divverent@xonotic.org>
Fri, 11 Oct 2013 14:51:19 +0000 (16:51 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Fri, 11 Oct 2013 14:51:19 +0000 (16:51 +0200)
commit265b681e0fb49239df1bfc431a903f66244a3172
tree9fc14f229873fba9675ffdb84b1c0b955af2253e
parente2ddf7d153328e3f2398d62d07c9e72badd89374
parent1e368ede69af478891b491c8e0564666910d9012
Merge remote-tracking branch 'origin/mirceakitsune/func_train_beizer_curve'

Conflicts:
qcsrc/server/t_plats.qc
qcsrc/common/util.qc
qcsrc/server/defs.qh
qcsrc/server/g_subs.qc
qcsrc/server/t_plats.qc