]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into mirceakitsune/universal_reload_system
authorMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Sun, 6 Feb 2011 22:42:52 +0000 (00:42 +0200)
committerMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Sun, 6 Feb 2011 22:42:52 +0000 (00:42 +0200)
commit7a02b95eb6d00e8f659ba4bc2db5d653af3e863b
treed8451ea00054807f2e2210c3b12ed1ba839908d6
parentfa05d87635808e8569add3dca4be9685af7eed46
parentfbf532df53354237024d54a392f865532601b75a
Merge branch 'master' into mirceakitsune/universal_reload_system
balanceXonotic.cfg
qcsrc/client/View.qc
qcsrc/server/autocvars.qh
qcsrc/server/bot/havocbot/havocbot.qc