]> 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, 30 Jan 2011 13:38:16 +0000 (15:38 +0200)
committerMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Sun, 30 Jan 2011 13:38:16 +0000 (15:38 +0200)
commitfdb8fddad19ce594e98563dd156fa349c0a834c6
tree3366819c70bdccf88be305766b6d2c72352e3681
parentb6e9ede0a2a2200bcb42a1ddc9919ecfdd515d37
parente142bf1bca72d0438a1f49d45526d99601bddfea
Merge branch 'master' into mirceakitsune/universal_reload_system
qcsrc/server/cl_client.qc
qcsrc/server/defs.qh
qcsrc/server/g_world.qc
qcsrc/server/w_crylink.qc