]> 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: 1756fb2 184b359)
Merge branch 'master' into mirceakitsune/old-steel-complex
authorMirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Tue, 19 Mar 2013 14:44:08 +0000 (16:44 +0200)
committerMirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Tue, 19 Mar 2013 14:44:08 +0000 (16:44 +0200)

Trivial merge