]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
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)
commit17a1111fdba07eb4323a700e72bb75537afee99a
treeb6045cff9616eb808f2d662811b14731c1619875
parent5ebc9d94dd0f5dc4edac09c9a94a07b63d6b02fb
parent939f709e0b7aef15091c56a824f12732262c00f0
Merge branch 'master' into TimePath/features/jetpack_jump
keybinds.txt.fr
qcsrc/server/defs.qh
qcsrc/server/miscfunctions.qc
qcsrc/server/mutators/mutator_nades.qc