]> 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>
Mon, 14 Feb 2011 16:08:51 +0000 (18:08 +0200)
committerMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Mon, 14 Feb 2011 16:08:51 +0000 (18:08 +0200)
commit766e44a12d34eda9b7e9b7963e6e083e877dfa8d
tree2c022ded54bdebc07dc26df7a7c412187a5e8ffd
parentdc5c35c50b41e50282ee9c7167369c1a78238300
parent1e80ce57f5d8f6f38ae19625d707db3b3c9db62a
Merge branch 'master' into mirceakitsune/universal_reload_system
qcsrc/common/items.qh
qcsrc/server/w_crylink.qc