]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote-tracking branch 'origin/master' into samual/weapons
authorSamual Lenks <samual@xonotic.org>
Sat, 15 Jun 2013 06:35:28 +0000 (02:35 -0400)
committerSamual Lenks <samual@xonotic.org>
Sat, 15 Jun 2013 06:35:28 +0000 (02:35 -0400)
commit6b7f6568458d842f2416c8fb0d6b5127a478cb44
treeb13436e1e7e1b8f81dee90e7963e99c5db296129
parent33095a161b78b2c486fda10f5941d891ce54ad57
parent93c5ad5c77f223cb3005c2bd4c49f35efdfb145f
Merge remote-tracking branch 'origin/master' into samual/weapons
balanceXonotic.cfg
oldbalanceXPM.cfg
qcsrc/server/cl_client.qc
qcsrc/server/vehicles/bumblebee.qc