]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote branch 'origin/master' into samual/balance
authorSamual <samual@xonotic.org>
Mon, 26 Sep 2011 16:34:09 +0000 (12:34 -0400)
committerSamual <samual@xonotic.org>
Mon, 26 Sep 2011 16:34:09 +0000 (12:34 -0400)
commit442cb7d862660f9bf07ca0333b413e52db3f7113
treedfc3f67c2f24c82d257a5bf7adb9c2ccf50104ce
parented3a4b0218ebbc32dc6080421bcd6432a0d393da
parenta084941bf63f7b642b99eb5845e3020792a58501
Merge remote branch 'origin/master' into samual/balance
balanceXonotic.cfg