]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote branch 'origin/master' into samual/balance
authorSamual <samual@xonotic.org>
Tue, 4 Oct 2011 22:53:20 +0000 (18:53 -0400)
committerSamual <samual@xonotic.org>
Tue, 4 Oct 2011 22:53:20 +0000 (18:53 -0400)
commit8249c3a8e3cb9b205f707caacf8756f651772a61
treea07cd5487a40df0328e5fa5a9727ac9ca454fe23
parent50e00110bb3855e1d989c0461dbf05ad9950e8e2
parent0c4f032df91d03d8c6af8265099e7385cbf64222
Merge remote branch 'origin/master' into samual/balance
defaultXonotic.cfg
qcsrc/server/miscfunctions.qc