Merge branch 'master' into TimePath/features/jetpack_jump
authorTimePath <andrew.hardaker1995@gmail.com>
Sat, 20 Dec 2014 09:26:11 +0000 (20:26 +1100)
committerTimePath <andrew.hardaker1995@gmail.com>
Sat, 20 Dec 2014 09:26:11 +0000 (20:26 +1100)
1  2 
keybinds.txt.fr
qcsrc/server/defs.qh
qcsrc/server/miscfunctions.qc
qcsrc/server/mutators/mutator_nades.qc

diff --cc keybinds.txt.fr
Simple merge
Simple merge
Simple merge