]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote-tracking branch 'origin/master' into samual/weapons
authorSamual Lenks <samual@xonotic.org>
Wed, 10 Jul 2013 06:28:33 +0000 (02:28 -0400)
committerSamual Lenks <samual@xonotic.org>
Wed, 10 Jul 2013 06:28:33 +0000 (02:28 -0400)
commit936363b20ad37d0f0e3bba07451219104652f1d5
treeee764beb18c24cd21879cec792b7c9e5c754892c
parentc545f117f61cd4afbbe6393464d6043c770ac84b
parent0031d67392b186b59957ab98309935c10f93de02
Merge remote-tracking branch 'origin/master' into samual/weapons
qcsrc/client/Main.qc
qcsrc/server/miscfunctions.qc