]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote-tracking branch 'origin/master' into samual/updatecommands
authorSamual <samual@xonotic.org>
Thu, 29 Sep 2011 05:25:30 +0000 (01:25 -0400)
committerSamual <samual@xonotic.org>
Thu, 29 Sep 2011 05:25:30 +0000 (01:25 -0400)
commitb2f9d91ff4f9da0c9592b89f7e38cc6f2beb188d
tree3a61e28d16213687e80104ff2d6ec7c61994e4fe
parentc7e1f5b4e123bfcfcb9f259090b275f4e7aeab30
parenta9f034bd247570b2b06c435599db8e283c1a42de
Merge remote-tracking branch 'origin/master' into samual/updatecommands
defaultXonotic.cfg