]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into mirceakitsune/universal_reload_system
authorMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Thu, 10 Feb 2011 16:49:35 +0000 (18:49 +0200)
committerMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Thu, 10 Feb 2011 16:49:35 +0000 (18:49 +0200)
commit194e2e23ed2569fd71f1f7cb5c33e833a46fcb2d
tree931266ce44908361d9130fe05336f228d987387d
parent7a02b95eb6d00e8f659ba4bc2db5d653af3e863b
parentc12eb78d00a660384a0f30c192b13bbbeae44b68
Merge branch 'master' into mirceakitsune/universal_reload_system
balanceXonotic.cfg
qcsrc/client/View.qc
qcsrc/server/autocvars.qh
qcsrc/server/cl_client.qc
qcsrc/server/defs.qh
qcsrc/server/w_minelayer.qc
qcsrc/server/w_nex.qc