git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit

]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit

projects / xonotic / xonotic-data.pk3dir.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 604ccb9 59dc17d)

author	Mario <mario@smbclan.net>
	Sat, 22 Oct 2016 17:48:51 +0000 (03:48 +1000)
committer	Mario <mario@smbclan.net>
	Sat, 22 Oct 2016 17:48:51 +0000 (03:48 +1000)
commit	8c965aa90470cfa8cbfaff88db71b6b5899a90ce
tree	864a1dc02e8ce8ee72cac028815d948bd2927dba	tree \| snapshot
parent	604ccb93bec64f7ecb2e1c8ea999636c4230b5c0	commit \| diff
parent	59dc17daa3fa802182911d0bb63ca385e8bdbf1c	commit \| diff

Merge branch 'master' into Mario/intrusive_2

15 files changed:

qcsrc/common/monsters/monster/shambler.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/monsters/monster/spider.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/monsters/sv_monsters.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/mutators/mutator/nades/nades.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/vehicles/sv_vehicles.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/arc.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/devastator.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/hagar.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/hook.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/mortar.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/weapon/seeker.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/client.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/defs.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/mutator/gamemode_ctf.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/player.qc	diff1 \|	diff2 \|	blob \| history