]> 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: 6ce7d6f 4815098)
Merge branch 'master' into mirceakitsune/playermodel_draconi
authorMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Sun, 13 May 2012 09:25:15 +0000 (12:25 +0300)
committerMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Sun, 13 May 2012 09:25:15 +0000 (12:25 +0300)

Trivial merge