]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote branch 'origin/master' into samual/updatecommands
authorSamual <samual@xonotic.org>
Sat, 10 Dec 2011 05:29:16 +0000 (00:29 -0500)
committerSamual <samual@xonotic.org>
Sat, 10 Dec 2011 05:29:16 +0000 (00:29 -0500)
commitda0466955e8df540625b5db7e99df08d0af26e58
tree3218ee277863bc35f1e1a0efddc46527af0b93cd
parent168e34edfe83e34c20cddf998cb81dea874adb99
parent315d0f398d5814c2a4351da2d53f064735620e88
Merge remote branch 'origin/master' into samual/updatecommands
defaultXonotic.cfg