]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into mirceakitsune/new_loading_screens
authorMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Fri, 13 May 2011 20:16:27 +0000 (23:16 +0300)
committerMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Fri, 13 May 2011 20:16:27 +0000 (23:16 +0300)
commitb20530900329e0ce4e3c22d729aa4367b83f2eb1
tree7306ab9a7e579199c42957ca3b8509f4e086eb14
parent58531c8828fb505a5de4c2236406788df1cb9889
parentbdfd71723a38e659cf26a894e07d8f77a5a1e79f
Merge branch 'master' into mirceakitsune/new_loading_screens
defaultXonotic.cfg