]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote-tracking branch 'origin/master' into samual/weapons
authorSamual Lenks <samual@xonotic.org>
Tue, 11 Jun 2013 07:51:42 +0000 (03:51 -0400)
committerSamual Lenks <samual@xonotic.org>
Tue, 11 Jun 2013 07:51:42 +0000 (03:51 -0400)
commitac95412d3724c77d53220831c32d6ad1c3996c23
treebc091bb8b589c130be3c5569e242c37259d1ba6b
parent2319ba1ea3a3c808a2833d6fdc34492898fbc7ce
parente557ad1d2eaf0e18be5931c5548049aa4cfecb39
Merge remote-tracking branch 'origin/master' into samual/weapons

Conflicts:
qcsrc/server/attic/monsters/monster_zombie.qc