]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote branch 'origin/master' into samual/updatecommands
authorSamual <samual@xonotic.org>
Sun, 1 Jan 2012 20:21:47 +0000 (15:21 -0500)
committerSamual <samual@xonotic.org>
Sun, 1 Jan 2012 20:21:47 +0000 (15:21 -0500)
commitb100e012a72d24db9c8bf50c81519e766d897a20
tree52c2c8d453b00761d307819bd520af349b690daa
parent4f926be80533640c5531417f7553de6c3da0c528
parent797664da00e9b4fe3d87338802fb661100d54bfc
Merge remote branch 'origin/master' into samual/updatecommands
defaultXonotic.cfg