Merge branch 'master' into TimePath/features/jetpack_jump
authorTimePath <andrew.hardaker1995@gmail.com>
Wed, 24 Dec 2014 03:43:49 +0000 (14:43 +1100)
committerTimePath <andrew.hardaker1995@gmail.com>
Wed, 24 Dec 2014 03:43:49 +0000 (14:43 +1100)
commit0986191f6eaee31bb1dcd6a663b821370c964509
treef8262c89830b90172134da747899a93a739a4f5f
parent4d0458765d26d5cd364009268b519d630c3315e2
parenta49ea317d1653b69432833840e11ff5d4fc77a1c
Merge branch 'master' into TimePath/features/jetpack_jump

Conflicts:
qcsrc/server/cl_physics.qc
defaultXonotic.cfg
qcsrc/menu/xonotic/dialog_settings_input.c
qcsrc/server/cl_client.qc
qcsrc/server/cl_physics.qc
qcsrc/server/t_items.qc