]> git.rm.cloudns.org Git - xonotic/xonotic-maps.pk3dir.git/commitdiff
projects / xonotic / xonotic-maps.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 19c3b4b 50c05a6)
Merge branch 'master' into mirceakitsune/old-steel-complex
authorMirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Thu, 6 Feb 2014 15:08:25 +0000 (17:08 +0200)
committerMirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Thu, 6 Feb 2014 15:08:25 +0000 (17:08 +0200)

Trivial merge