]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into mirceakitsune/player_cubemaps
authorMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Sun, 13 May 2012 09:08:54 +0000 (12:08 +0300)
committerMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Sun, 13 May 2012 09:08:54 +0000 (12:08 +0300)
commit81a396973d3038c88815d4dfa4b871b39056467b
tree92eeb81b94641d37608d11c662659cf3a071e687
parent1869a1534078ca2c6fa31f1cde65391790ed165f
parent481509839fb065e8854b533da2093424cd058e7e
Merge branch 'master' into mirceakitsune/player_cubemaps