]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7e0e4f8 9944e4f)
Merge branch 'master' into mirceakitsune/playermodel_terminus
authorMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Sun, 6 Oct 2013 15:16:41 +0000 (18:16 +0300)
committerMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Sun, 6 Oct 2013 15:16:41 +0000 (18:16 +0300)

Trivial merge